Skip to content

Commit 018c35c

Browse files
committed
Merge pull request #106 from GCheung55/patch-1
Prevent module name conflicts with bootstrap namespace.
2 parents 812821e + c1c1544 commit 018c35c

File tree

2 files changed

+69
-69
lines changed

2 files changed

+69
-69
lines changed

bootstrap/index.styl

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,52 @@
55
*/
66

77
// Core variables and mixins
8-
@import "variables"
9-
@import "mixins"
8+
@import "bootstrap/variables"
9+
@import "bootstrap/mixins"
1010

1111
// Reset and dependencies
12-
@import "normalize"
13-
@import "print"
14-
@import "glyphicons"
12+
@import "bootstrap/normalize"
13+
@import "bootstrap/print"
14+
@import "bootstrap/glyphicons"
1515

1616
// Core CSS
17-
@import "scaffolding"
18-
@import "utilities"
19-
@import "type"
20-
@import "code"
21-
@import "grid"
22-
@import "tables"
23-
@import "forms"
24-
@import "buttons"
17+
@import "bootstrap/scaffolding"
18+
@import "bootstrap/utilities"
19+
@import "bootstrap/type"
20+
@import "bootstrap/code"
21+
@import "bootstrap/grid"
22+
@import "bootstrap/tables"
23+
@import "bootstrap/forms"
24+
@import "bootstrap/buttons"
2525

2626
// Components
27-
@import "component-animations"
28-
@import "dropdowns"
29-
@import "button-groups"
30-
@import "input-groups"
31-
@import "navs"
32-
@import "navbar"
33-
@import "breadcrumbs"
34-
@import "pagination"
35-
@import "pager"
36-
@import "labels"
37-
@import "badges"
38-
@import "jumbotron"
39-
@import "thumbnails"
40-
@import "alerts"
41-
@import "progress-bars"
42-
@import "media"
43-
@import "list-group"
44-
@import "panels"
45-
@import "responsive-embed"
46-
@import "wells"
47-
@import "close"
27+
@import "bootstrap/component-animations"
28+
@import "bootstrap/dropdowns"
29+
@import "bootstrap/button-groups"
30+
@import "bootstrap/input-groups"
31+
@import "bootstrap/navs"
32+
@import "bootstrap/navbar"
33+
@import "bootstrap/breadcrumbs"
34+
@import "bootstrap/pagination"
35+
@import "bootstrap/pager"
36+
@import "bootstrap/labels"
37+
@import "bootstrap/badges"
38+
@import "bootstrap/jumbotron"
39+
@import "bootstrap/thumbnails"
40+
@import "bootstrap/alerts"
41+
@import "bootstrap/progress-bars"
42+
@import "bootstrap/media"
43+
@import "bootstrap/list-group"
44+
@import "bootstrap/panels"
45+
@import "bootstrap/responsive-embed"
46+
@import "bootstrap/wells"
47+
@import "bootstrap/close"
4848

4949
// Components w/ JavaScript
50-
@import "modals"
51-
@import "tooltip"
52-
@import "popovers"
53-
@import "carousel"
50+
@import "bootstrap/modals"
51+
@import "bootstrap/tooltip"
52+
@import "bootstrap/popovers"
53+
@import "bootstrap/carousel"
5454

5555
// Utility classes
56-
@import "responsive-utilities"
56+
@import "bootstrap/responsive-utilities"

bootstrap/mixins.styl

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@ percentage($n)
1010

1111
// Utilities
1212

13-
@import "mixins/hide-text"
14-
@import "mixins/opacity"
15-
@import "mixins/image"
16-
@import "mixins/labels"
17-
@import "mixins/reset-filter"
18-
@import "mixins/resize"
19-
@import "mixins/responsive-visibility"
20-
@import "mixins/size"
21-
@import "mixins/tab-focus"
22-
@import "mixins/reset-text"
23-
@import "mixins/text-emphasis"
24-
@import "mixins/text-overflow"
25-
@import "mixins/vendor-prefixes"
13+
@import "bootstrap/mixins/hide-text"
14+
@import "bootstrap/mixins/opacity"
15+
@import "bootstrap/mixins/image"
16+
@import "bootstrap/mixins/labels"
17+
@import "bootstrap/mixins/reset-filter"
18+
@import "bootstrap/mixins/resize"
19+
@import "bootstrap/mixins/responsive-visibility"
20+
@import "bootstrap/mixins/size"
21+
@import "bootstrap/mixins/tab-focus"
22+
@import "bootstrap/mixins/reset-text"
23+
@import "bootstrap/mixins/text-emphasis"
24+
@import "bootstrap/mixins/text-overflow"
25+
@import "bootstrap/mixins/vendor-prefixes"
2626

2727
// Components
28-
@import "mixins/alerts"
29-
@import "mixins/buttons"
30-
@import "mixins/panels"
31-
@import "mixins/pagination"
32-
@import "mixins/list-group"
33-
@import "mixins/nav-divider"
34-
@import "mixins/forms"
35-
@import "mixins/progress-bar"
36-
@import "mixins/table-row"
28+
@import "bootstrap/mixins/alerts"
29+
@import "bootstrap/mixins/buttons"
30+
@import "bootstrap/mixins/panels"
31+
@import "bootstrap/mixins/pagination"
32+
@import "bootstrap/mixins/list-group"
33+
@import "bootstrap/mixins/nav-divider"
34+
@import "bootstrap/mixins/forms"
35+
@import "bootstrap/mixins/progress-bar"
36+
@import "bootstrap/mixins/table-row"
3737

3838
// Skins
39-
@import "mixins/background-variant"
40-
@import "mixins/border-radius"
41-
@import "mixins/gradients"
39+
@import "bootstrap/mixins/background-variant"
40+
@import "bootstrap/mixins/border-radius"
41+
@import "bootstrap/mixins/gradients"
4242

4343
// Layout
44-
@import "mixins/clearfix"
45-
@import "mixins/center-block"
46-
@import "mixins/nav-vertical-align"
47-
@import "mixins/grid-framework"
48-
@import "mixins/grid"
44+
@import "bootstrap/mixins/clearfix"
45+
@import "bootstrap/mixins/center-block"
46+
@import "bootstrap/mixins/nav-vertical-align"
47+
@import "bootstrap/mixins/grid-framework"
48+
@import "bootstrap/mixins/grid"

0 commit comments

Comments
 (0)