Skip to content

Commit c5b1343

Browse files
committed
updates bootstrap @4.*
1 parent 04fa089 commit c5b1343

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

wherehows-web/ember-cli-build.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ module.exports = function (defaults) {
7878
destDir: '/'
7979
});
8080

81-
const bsFontTree = new Funnel('node_modules/bootstrap/dist/fonts', {
82-
srcDir: '/',
83-
include: ['**/*.woff2', '**/*.woff', '**/*.ttf'],
84-
destDir: '/assets/fonts'
85-
});
86-
8781
const treegridImgTree = new Funnel('node_modules/jquery-treegrid/img', {
8882
srcDir: '/',
8983
include: ['**/*.png'],
@@ -128,5 +122,5 @@ module.exports = function (defaults) {
128122
}]
129123
});
130124

131-
return app.toTree([faFontTree, bsFontTree, treegridImgTree]);
125+
return app.toTree([faFontTree, treegridImgTree]);
132126
};

wherehows-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"typescript": "^3.0.1"
100100
},
101101
"dependencies": {
102-
"bootstrap": "3.3.7",
102+
"bootstrap": "^4.2.1",
103103
"dynamic-link": "^0.2.3",
104104
"ember-cli-mirage": "^0.4.9",
105105
"ember-cli-string-helpers": "^1.4.0",

wherehows-web/yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,6 +1480,11 @@ bootstrap@3.3.7:
14801480
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"
14811481
integrity sha1-WjiTlFSfIzMIdaOxUGVldPip63E=
14821482

1483+
bootstrap@^4.2.1:
1484+
version "4.2.1"
1485+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.2.1.tgz#8f8bdca024dbf0e8644da32e918c8a03a90a5757"
1486+
integrity sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q==
1487+
14831488
bower-config@^1.3.0:
14841489
version "1.4.1"
14851490
resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.1.tgz#85fd9df367c2b8dbbd0caa4c5f2bad40cd84c2cc"

0 commit comments

Comments
 (0)