diff options
| author | Mark Otto <[email protected]> | 2015-08-23 22:13:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-23 22:13:58 -0700 |
| commit | 7633d4c603d916bb2174dd5a6d4063449088caef (patch) | |
| tree | ec468281ab3bf8708f012cda07f5453eead39c65 /scss | |
| parent | 4b63173a41ccb52f5db399557fac89aadf150826 (diff) | |
| download | bootstrap-7633d4c603d916bb2174dd5a6d4063449088caef.tar.xz bootstrap-7633d4c603d916bb2174dd5a6d4063449088caef.zip | |
Make predefined grid classes conditional
- Add explicit -grid-classes variable and set to true by default
- Wrap .row and .col generation in the boolean var
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_grid.scss | 12 | ||||
| -rw-r--r-- | scss/_variables.scss | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/scss/_grid.scss b/scss/_grid.scss index b71d5b03d..c0988f732 100644 --- a/scss/_grid.scss +++ b/scss/_grid.scss @@ -28,8 +28,10 @@ // // Rows contain and clear the floats of your columns. -.row { - @include make-row(); +@if $enable-grid-classes { + .row { + @include make-row(); + } } @@ -37,14 +39,16 @@ // // Common styles for small and large grid columns -@include make-grid-columns(); +@if $enable-grid-classes { + @include make-grid-columns(); +} // Flex variation // // Custom styles for additional flex alignment options. -@if $enable-flex { +@if $enable-flex and $enable-grid-classes { // Flex column reordering diff --git a/scss/_variables.scss b/scss/_variables.scss index 3b31dbdaf..8e7614bcf 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -49,6 +49,7 @@ $enable-shadows: false !default; $enable-gradients: false !default; $enable-transitions: false !default; $enable-hover-media-query: false !default; +$enable-grid-classes: true !default; // Spacing |