From e558cccb60f4292b6a520a0bcd9847ff40b804dd Mon Sep 17 00:00:00 2001
From: jelhan <jeldrik@systemli.org>
Date: Tue, 24 May 2016 01:06:47 +0200
Subject: [PATCH] add ember-bootstrap

---
 app/styles/app.less |  2 +-
 bower.json          |  2 +-
 ember-cli-build.js  | 24 +++---------------------
 package.json        |  2 ++
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/app/styles/app.less b/app/styles/app.less
index 207be2e..5f9f165 100644
--- a/app/styles/app.less
+++ b/app/styles/app.less
@@ -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 {
diff --git a/bower.json b/bower.json
index 8145d6d..59b2a0f 100644
--- a/bower.json
+++ b/bower.json
@@ -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",
diff --git a/ember-cli-build.js b/ember-cli-build.js
index b1c9d2a..dd97d7f 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -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');
diff --git a/package.json b/package.json
index 1b0d638..eada710 100644
--- a/package.json
+++ b/package.json
@@ -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",