diff --git a/package.json b/package.json index b4d96edc10..6b4f03abf7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "angular": "^1.5.8", - "bootstrap": "^3.3.7", + "bootstrap": "3.1.1", "graphitejs": "https://github.com/prestontimmons/graphitejs/archive/master.tar.gz", "jquery": "^3.3.1", "jquery-visibility": "https://github.com/mathiasbynens/jquery-visibility/archive/master.tar.gz" diff --git a/web/config/webpack.common.js b/web/config/webpack.common.js index 52ef1f6b37..2507915c92 100644 --- a/web/config/webpack.common.js +++ b/web/config/webpack.common.js @@ -90,7 +90,7 @@ module.exports = { // The majority of the rules below are all about getting bootstrap copied // appropriately. { - test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, + test: /\.woff(2)?(\?v=\d+\.\d+\.\d+)?$/, use: { loader: "url-loader", options: { @@ -127,10 +127,6 @@ module.exports = { test: /\.html$/, use: ['raw-loader'], exclude: /node_modules/ - }, - { - test: /\.(ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/, - use: ['file-loader'] } ] } diff --git a/yarn.lock b/yarn.lock index 8a9eda559e..1811bba946 100644 --- a/yarn.lock +++ b/yarn.lock @@ -968,9 +968,9 @@ boom@2.x.x: dependencies: hoek "2.x.x" -bootstrap@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71" +bootstrap@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.1.1.tgz#17e14ed261c0fcd9b52ea9aa6420f6d51cd5fa77" brace-expansion@^1.1.7: version "1.1.11"