Skip to content

Commit 035256b

Browse files
committed
Upgrade to bootstrap 4. Markup not updated yet.
1 parent 443e842 commit 035256b

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

bower.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mcac",
33
"dependencies": {
44
"Faker": "~3.1.0",
5-
"bootstrap": "~3.3.1",
5+
"bootstrap": "4.0.0-alpha.4",
66
"bootstrap-markdown": "~2.8.0",
77
"ember": "~2.7.0",
88
"ember-cli-shims": "0.1.0",
@@ -22,9 +22,11 @@
2222
"pace": "~1.0.2",
2323
"pretender": "~1.1.0",
2424
"qunit": "~1.17.1",
25-
"ceibo": "~1.1.0"
25+
"ceibo": "~1.1.0",
26+
"tether": "^1.3.7"
2627
},
2728
"resolutions": {
28-
"ember": "~2.7.0"
29+
"ember": "~2.7.0",
30+
"bootstrap": "4.0.0-alpha.4"
2931
}
3032
}

ember-cli-build.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ module.exports = function(defaults) {
4949
}
5050
});
5151

52+
app.import('bower_components/tether/dist/js/tether.js');
53+
app.import('bower_components/tether/dist/css/tether.css');
5254
app.import('bower_components/bootstrap/dist/js/bootstrap.js');
5355
app.import('bower_components/bootstrap/dist/css/bootstrap.css');
5456
app.import('bower_components/moment/moment.js');
@@ -63,16 +65,11 @@ module.exports = function(defaults) {
6365

6466
var mergeTrees = require('broccoli-merge-trees');
6567
var pickFiles = require('broccoli-static-compiler');
66-
var bootstrapFonts = pickFiles('bower_components/bootstrap/dist/fonts', {
67-
srcDir: '/',
68-
files: ['**/*'],
69-
destDir: '/fonts'
70-
});
7168
var customFonts = pickFiles('vendor/fontello/font', {
7269
srcDir: '/',
7370
files: ['**/*'],
7471
destDir: '/font'
7572
});
7673

77-
return mergeTrees([app.toTree(), bootstrapFonts, customFonts]);
74+
return mergeTrees([app.toTree(), customFonts]);
7875
};

0 commit comments

Comments
 (0)