fix(less): Makes less bootstrap dir a variable

Makes the bootstrap directory import use a variable so that it can be overwitten. Closes #3368
angular-ui · Aug 15, 2015 · 654c75f · 654c75f
1 parent 5773d3a
commit 654c75f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 38 deletions.
diff --git a/src/less/bootstrap/bootstrap.less b/src/less/bootstrap/bootstrap.less
@@ -27,52 +27,52 @@
  */
 #ui-grid-twbs {
   // Core variables and mixins
-  @import (reference) "../../../node_modules/bootstrap/less/variables.less";
-  @import (reference) "../../../node_modules/bootstrap/less/mixins.less";
+  @import (reference) "@{bootstrapDirectory}/less/variables.less";
+  @import (reference) "@{bootstrapDirectory}/less/mixins.less";
 
   // Reset and dependencies
-  @import (reference) "../../../node_modules/bootstrap/less/normalize.less";
-  @import (reference) "../../../node_modules/bootstrap/less/print.less";
-  @import (reference) "../../../node_modules/bootstrap/less/glyphicons.less";
+  @import (reference) "@{bootstrapDirectory}/less/normalize.less";
+  @import (reference) "@{bootstrapDirectory}/less/print.less";
+  @import (reference) "@{bootstrapDirectory}/less/glyphicons.less";
 
   // Core CSS
-  @import (reference) "../../../node_modules/bootstrap/less/scaffolding.less";
-  @import (reference) "../../../node_modules/bootstrap/less/code.less";
-  @import (reference) "../../../node_modules/bootstrap/less/tables.less";
-  @import (reference) "../../../node_modules/bootstrap/less/forms.less";
-  @import (reference) "../../../node_modules/bootstrap/less/buttons.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/type.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/grid.less";
+  @import (reference) "@{bootstrapDirectory}/less/scaffolding.less";
+  @import (reference) "@{bootstrapDirectory}/less/code.less";
+  @import (reference) "@{bootstrapDirectory}/less/tables.less";
+  @import (reference) "@{bootstrapDirectory}/less/forms.less";
+  @import (reference) "@{bootstrapDirectory}/less/buttons.less";
+  //@import (reference) "@{bootstrapDirectory}/less/type.less";
+  //@import (reference) "@{bootstrapDirectory}/less/grid.less";
 
   // Components
-  @import (reference) "../../../node_modules/bootstrap/less/component-animations.less";
-  @import (reference) "../../../node_modules/bootstrap/less/dropdowns.less";
-  @import (reference) "../../../node_modules/bootstrap/less/button-groups.less";
-  @import (reference) "../../../node_modules/bootstrap/less/input-groups.less";
-  @import (reference) "../../../node_modules/bootstrap/less/breadcrumbs.less";
-  @import (reference) "../../../node_modules/bootstrap/less/pagination.less";
-  @import (reference) "../../../node_modules/bootstrap/less/labels.less";
-  @import (reference) "../../../node_modules/bootstrap/less/badges.less";
-  @import (reference) "../../../node_modules/bootstrap/less/jumbotron.less";
-  @import (reference) "../../../node_modules/bootstrap/less/alerts.less";
-  @import (reference) "../../../node_modules/bootstrap/less/progress-bars.less";
-  @import (reference) "../../../node_modules/bootstrap/less/media.less";
-  @import (reference) "../../../node_modules/bootstrap/less/list-group.less";
-  @import (reference) "../../../node_modules/bootstrap/less/responsive-embed.less";
-  @import (reference) "../../../node_modules/bootstrap/less/wells.less";
-  @import (reference) "../../../node_modules/bootstrap/less/close.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/navs.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/navbar.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/pager.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/thumbnails.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/panels.less";
+  @import (reference) "@{bootstrapDirectory}/less/component-animations.less";
+  @import (reference) "@{bootstrapDirectory}/less/dropdowns.less";
+  @import (reference) "@{bootstrapDirectory}/less/button-groups.less";
+  @import (reference) "@{bootstrapDirectory}/less/input-groups.less";
+  @import (reference) "@{bootstrapDirectory}/less/breadcrumbs.less";
+  @import (reference) "@{bootstrapDirectory}/less/pagination.less";
+  @import (reference) "@{bootstrapDirectory}/less/labels.less";
+  @import (reference) "@{bootstrapDirectory}/less/badges.less";
+  @import (reference) "@{bootstrapDirectory}/less/jumbotron.less";
+  @import (reference) "@{bootstrapDirectory}/less/alerts.less";
+  @import (reference) "@{bootstrapDirectory}/less/progress-bars.less";
+  @import (reference) "@{bootstrapDirectory}/less/media.less";
+  @import (reference) "@{bootstrapDirectory}/less/list-group.less";
+  @import (reference) "@{bootstrapDirectory}/less/responsive-embed.less";
+  @import (reference) "@{bootstrapDirectory}/less/wells.less";
+  @import (reference) "@{bootstrapDirectory}/less/close.less";
+  //@import (reference) "@{bootstrapDirectory}/less/navs.less";
+  //@import (reference) "@{bootstrapDirectory}/less/navbar.less";
+  //@import (reference) "@{bootstrapDirectory}/less/pager.less";
+  //@import (reference) "@{bootstrapDirectory}/less/thumbnails.less";
+  //@import (reference) "@{bootstrapDirectory}/less/panels.less";
 
   // Components w/ JavaScript
-  @import (reference) "../../../node_modules/bootstrap/less/tooltip.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/modals.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/popovers.less";
+  @import (reference) "@{bootstrapDirectory}/less/tooltip.less";
+  //@import (reference) "@{bootstrapDirectory}/less/modals.less";
+  //@import (reference) "@{bootstrapDirectory}/less/popovers.less";
 
   // Utility classes
-  @import (reference) "../../../node_modules/bootstrap/less/utilities.less";
-  //@import (reference) "../../../node_modules/bootstrap/less/responsive-utilities.less";
+  @import (reference) "@{bootstrapDirectory}/less/utilities.less";
+  //@import (reference) "@{bootstrapDirectory}/less/responsive-utilities.less";
 }
diff --git a/src/less/variables.less b/src/less/variables.less
@@ -3,6 +3,8 @@
 
 /*-- VARIABLES (DO NOT REMOVE THESE COMMENTS) --*/
 
+@bootstrapDirectory: "../../../node_modules/bootstrap";
+
 /**
 * @section Grid styles
 */