diff options
| author | Mark Otto <[email protected]> | 2015-09-01 20:16:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-09-01 20:16:22 -0700 |
| commit | a748e251fd0bd5c4a6bf93366c44fcc34aa00d0d (patch) | |
| tree | 21e9447979a245970c8f45e6231dcba64ff417b1 | |
| parent | c053f23fe6a30ce0b02b643f04718c8a78c79435 (diff) | |
| parent | 7633d4c603d916bb2174dd5a6d4063449088caef (diff) | |
| download | bootstrap-a748e251fd0bd5c4a6bf93366c44fcc34aa00d0d.tar.xz bootstrap-a748e251fd0bd5c4a6bf93366c44fcc34aa00d0d.zip | |
Merge pull request #17259 from twbs/v4gc
v4: Conditional predefined grid classes
| -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 1841b7faa..2f58dc1ea 100644 --- a/scss/_grid.scss +++ b/scss/_grid.scss @@ -23,8 +23,10 @@ // // Rows contain and clear the floats of your columns. -.row { - @include make-row(); +@if $enable-grid-classes { + .row { + @include make-row(); + } } @@ -32,14 +34,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 cfaf954a1..a01c12440 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 |