File tree Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change 2
2
"name" : " mcac" ,
3
3
"dependencies" : {
4
4
"Faker" : " ~3.1.0" ,
5
- "bootstrap" : " ~3.3.1 " ,
5
+ "bootstrap" : " 4.0.0-alpha.4 " ,
6
6
"bootstrap-markdown" : " ~2.8.0" ,
7
7
"ember" : " ~2.7.0" ,
8
8
"ember-cli-shims" : " 0.1.0" ,
22
22
"pace" : " ~1.0.2" ,
23
23
"pretender" : " ~1.1.0" ,
24
24
"qunit" : " ~1.17.1" ,
25
- "ceibo" : " ~1.1.0"
25
+ "ceibo" : " ~1.1.0" ,
26
+ "tether" : " ^1.3.7"
26
27
},
27
28
"resolutions" : {
28
- "ember" : " ~2.7.0"
29
+ "ember" : " ~2.7.0" ,
30
+ "bootstrap" : " 4.0.0-alpha.4"
29
31
}
30
32
}
Original file line number Diff line number Diff line change @@ -49,6 +49,8 @@ module.exports = function(defaults) {
49
49
}
50
50
} ) ;
51
51
52
+ app . import ( 'bower_components/tether/dist/js/tether.js' ) ;
53
+ app . import ( 'bower_components/tether/dist/css/tether.css' ) ;
52
54
app . import ( 'bower_components/bootstrap/dist/js/bootstrap.js' ) ;
53
55
app . import ( 'bower_components/bootstrap/dist/css/bootstrap.css' ) ;
54
56
app . import ( 'bower_components/moment/moment.js' ) ;
@@ -63,16 +65,11 @@ module.exports = function(defaults) {
63
65
64
66
var mergeTrees = require ( 'broccoli-merge-trees' ) ;
65
67
var pickFiles = require ( 'broccoli-static-compiler' ) ;
66
- var bootstrapFonts = pickFiles ( 'bower_components/bootstrap/dist/fonts' , {
67
- srcDir : '/' ,
68
- files : [ '**/*' ] ,
69
- destDir : '/fonts'
70
- } ) ;
71
68
var customFonts = pickFiles ( 'vendor/fontello/font' , {
72
69
srcDir : '/' ,
73
70
files : [ '**/*' ] ,
74
71
destDir : '/font'
75
72
} ) ;
76
73
77
- return mergeTrees ( [ app . toTree ( ) , bootstrapFonts , customFonts ] ) ;
74
+ return mergeTrees ( [ app . toTree ( ) , customFonts ] ) ;
78
75
} ;
You can’t perform that action at this time.
0 commit comments