add ember-bootstrap

This commit is contained in:
jelhan 2016-05-24 01:06:47 +02:00
parent 6e671f0f3b
commit e558cccb60
4 changed files with 7 additions and 23 deletions

View file

@ -1,4 +1,4 @@
@import "bower_components/bootstrap/less/bootstrap.less";
@import "ember-bootstrap/bootstrap";
@import "bower_components/bootstrap-datepicker/less/datepicker3.less";
table tr td .form-group {

View file

@ -13,7 +13,7 @@
"loader.js": "ember-cli/loader.js#3.4.0",
"qunit": "~1.20.0",
"sjcl": "~1.0.0",
"bootstrap": "~3.3.4",
"bootstrap": "~3.3.5",
"bootstrap-datepicker": "~1.4.0",
"floatThead": "1.2.12",
"modernizr": "~2.8.3",

View file

@ -14,6 +14,9 @@ module.exports = function() {
},
'buildInfoOptions': {
'metaTemplate': 'version={SEMVER}'
},
'ember-bootstrap': {
importBootstrapCSS: false
}
});
@ -30,27 +33,6 @@ module.exports = function() {
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.
app.import({
development: 'bower_components/bootstrap/dist/js/bootstrap.js',
production: 'bower_components/bootstrap/dist/js/bootstrap.min.js'
});
app.import({
development: 'bower_components/bootstrap/dist/css/bootstrap.css',
production: 'bower_components/bootstrap/dist/css/bootstrap.min.css'
});
if (app.env === 'development' || app.env === 'test') {
app.import('bower_components/bootstrap/dist/css/bootstrap.css.map', {
destDir: 'assets'
});
}
// include bootstrap fonts in dist
trees.push(
pickFiles('bower_components/bootstrap/dist/fonts', {
srcDir: '/',
destDir: '/fonts'
})
);
app.import('bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js');
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.de.js');
app.import('bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.es.js');

View file

@ -25,6 +25,8 @@
"broccoli-unwatched-tree": "^0.1.1",
"connect-restreamer": "^1.0.1",
"cors": "^2.5.3",
"ember-bootstrap": "0.7.1",
"ember-bootstrap-cp-validations": "0.1.1",
"ember-cli": "1.13.13",
"ember-cli-acceptance-test-helpers": "0.4.0",
"ember-cli-app-version": "^1.0.0",