Skip to content

Commit 654c75f

Browse files
committed
fix(less): Makes less bootstrap dir a variable
Makes the bootstrap directory import use a variable so that it can be overwitten. Closes #3368
1 parent 5773d3a commit 654c75f

File tree

2 files changed

+40
-38
lines changed

2 files changed

+40
-38
lines changed

src/less/bootstrap/bootstrap.less

+38-38
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,52 @@
2727
*/
2828
#ui-grid-twbs {
2929
// Core variables and mixins
30-
@import (reference) "../../../node_modules/bootstrap/less/variables.less";
31-
@import (reference) "../../../node_modules/bootstrap/less/mixins.less";
30+
@import (reference) "@{bootstrapDirectory}/less/variables.less";
31+
@import (reference) "@{bootstrapDirectory}/less/mixins.less";
3232

3333
// Reset and dependencies
34-
@import (reference) "../../../node_modules/bootstrap/less/normalize.less";
35-
@import (reference) "../../../node_modules/bootstrap/less/print.less";
36-
@import (reference) "../../../node_modules/bootstrap/less/glyphicons.less";
34+
@import (reference) "@{bootstrapDirectory}/less/normalize.less";
35+
@import (reference) "@{bootstrapDirectory}/less/print.less";
36+
@import (reference) "@{bootstrapDirectory}/less/glyphicons.less";
3737

3838
// Core CSS
39-
@import (reference) "../../../node_modules/bootstrap/less/scaffolding.less";
40-
@import (reference) "../../../node_modules/bootstrap/less/code.less";
41-
@import (reference) "../../../node_modules/bootstrap/less/tables.less";
42-
@import (reference) "../../../node_modules/bootstrap/less/forms.less";
43-
@import (reference) "../../../node_modules/bootstrap/less/buttons.less";
44-
//@import (reference) "../../../node_modules/bootstrap/less/type.less";
45-
//@import (reference) "../../../node_modules/bootstrap/less/grid.less";
39+
@import (reference) "@{bootstrapDirectory}/less/scaffolding.less";
40+
@import (reference) "@{bootstrapDirectory}/less/code.less";
41+
@import (reference) "@{bootstrapDirectory}/less/tables.less";
42+
@import (reference) "@{bootstrapDirectory}/less/forms.less";
43+
@import (reference) "@{bootstrapDirectory}/less/buttons.less";
44+
//@import (reference) "@{bootstrapDirectory}/less/type.less";
45+
//@import (reference) "@{bootstrapDirectory}/less/grid.less";
4646

4747
// Components
48-
@import (reference) "../../../node_modules/bootstrap/less/component-animations.less";
49-
@import (reference) "../../../node_modules/bootstrap/less/dropdowns.less";
50-
@import (reference) "../../../node_modules/bootstrap/less/button-groups.less";
51-
@import (reference) "../../../node_modules/bootstrap/less/input-groups.less";
52-
@import (reference) "../../../node_modules/bootstrap/less/breadcrumbs.less";
53-
@import (reference) "../../../node_modules/bootstrap/less/pagination.less";
54-
@import (reference) "../../../node_modules/bootstrap/less/labels.less";
55-
@import (reference) "../../../node_modules/bootstrap/less/badges.less";
56-
@import (reference) "../../../node_modules/bootstrap/less/jumbotron.less";
57-
@import (reference) "../../../node_modules/bootstrap/less/alerts.less";
58-
@import (reference) "../../../node_modules/bootstrap/less/progress-bars.less";
59-
@import (reference) "../../../node_modules/bootstrap/less/media.less";
60-
@import (reference) "../../../node_modules/bootstrap/less/list-group.less";
61-
@import (reference) "../../../node_modules/bootstrap/less/responsive-embed.less";
62-
@import (reference) "../../../node_modules/bootstrap/less/wells.less";
63-
@import (reference) "../../../node_modules/bootstrap/less/close.less";
64-
//@import (reference) "../../../node_modules/bootstrap/less/navs.less";
65-
//@import (reference) "../../../node_modules/bootstrap/less/navbar.less";
66-
//@import (reference) "../../../node_modules/bootstrap/less/pager.less";
67-
//@import (reference) "../../../node_modules/bootstrap/less/thumbnails.less";
68-
//@import (reference) "../../../node_modules/bootstrap/less/panels.less";
48+
@import (reference) "@{bootstrapDirectory}/less/component-animations.less";
49+
@import (reference) "@{bootstrapDirectory}/less/dropdowns.less";
50+
@import (reference) "@{bootstrapDirectory}/less/button-groups.less";
51+
@import (reference) "@{bootstrapDirectory}/less/input-groups.less";
52+
@import (reference) "@{bootstrapDirectory}/less/breadcrumbs.less";
53+
@import (reference) "@{bootstrapDirectory}/less/pagination.less";
54+
@import (reference) "@{bootstrapDirectory}/less/labels.less";
55+
@import (reference) "@{bootstrapDirectory}/less/badges.less";
56+
@import (reference) "@{bootstrapDirectory}/less/jumbotron.less";
57+
@import (reference) "@{bootstrapDirectory}/less/alerts.less";
58+
@import (reference) "@{bootstrapDirectory}/less/progress-bars.less";
59+
@import (reference) "@{bootstrapDirectory}/less/media.less";
60+
@import (reference) "@{bootstrapDirectory}/less/list-group.less";
61+
@import (reference) "@{bootstrapDirectory}/less/responsive-embed.less";
62+
@import (reference) "@{bootstrapDirectory}/less/wells.less";
63+
@import (reference) "@{bootstrapDirectory}/less/close.less";
64+
//@import (reference) "@{bootstrapDirectory}/less/navs.less";
65+
//@import (reference) "@{bootstrapDirectory}/less/navbar.less";
66+
//@import (reference) "@{bootstrapDirectory}/less/pager.less";
67+
//@import (reference) "@{bootstrapDirectory}/less/thumbnails.less";
68+
//@import (reference) "@{bootstrapDirectory}/less/panels.less";
6969

7070
// Components w/ JavaScript
71-
@import (reference) "../../../node_modules/bootstrap/less/tooltip.less";
72-
//@import (reference) "../../../node_modules/bootstrap/less/modals.less";
73-
//@import (reference) "../../../node_modules/bootstrap/less/popovers.less";
71+
@import (reference) "@{bootstrapDirectory}/less/tooltip.less";
72+
//@import (reference) "@{bootstrapDirectory}/less/modals.less";
73+
//@import (reference) "@{bootstrapDirectory}/less/popovers.less";
7474

7575
// Utility classes
76-
@import (reference) "../../../node_modules/bootstrap/less/utilities.less";
77-
//@import (reference) "../../../node_modules/bootstrap/less/responsive-utilities.less";
76+
@import (reference) "@{bootstrapDirectory}/less/utilities.less";
77+
//@import (reference) "@{bootstrapDirectory}/less/responsive-utilities.less";
7878
}

src/less/variables.less

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
/*-- VARIABLES (DO NOT REMOVE THESE COMMENTS) --*/
55

6+
@bootstrapDirectory: "../../../node_modules/bootstrap";
7+
68
/**
79
* @section Grid styles
810
*/

0 commit comments

Comments
 (0)