Bugfix/delete original bootstrap things (#52)

* Delete bootstrap related things #51 * cleanup ember-cli-build #51 * move bootstrap imports to main scss file #51 * Move back brocolli tree hacks #51
ember-learn · May 23, 2018 · aac2031 · aac2031
1 parent 45d56bb
commit aac2031
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1,484 deletions.
diff --git a/addon/styles/_es-navbar.scss b/addon/styles/_es-navbar.scss
@@ -1,7 +1,3 @@
-@import 'ember-bootstrap/dropdown';
-@import 'ember-bootstrap/navbar';
-@import 'ember-bootstrap/transitions';
-
 /**
   Navbar in header
 **/

diff --git a/addon/styles/addon.scss b/addon/styles/addon.scss
@@ -5,6 +5,9 @@
 @import 'ember-bootstrap/variables';
 @import 'ember-bootstrap/mixins';
 @import 'ember-bootstrap/grid';
+@import 'ember-bootstrap/dropdown';
+@import 'ember-bootstrap/navbar';
+@import 'ember-bootstrap/transitions';
 
 @import 'variables';
 @import 'normalize';