diff options
| author | Mark Otto <markd.otto@gmail.com> | 2015-09-02 06:16:22 +0300 |
|---|---|---|
| committer | Mark Otto <markd.otto@gmail.com> | 2015-09-02 06:16:22 +0300 |
| commit | a748e251fd0bd5c4a6bf93366c44fcc34aa00d0d (patch) | |
| tree | 21e9447979a245970c8f45e6231dcba64ff417b1 /scss/_grid.scss | |
| parent | c053f23fe6a30ce0b02b643f04718c8a78c79435 (diff) | |
| parent | 7633d4c603d916bb2174dd5a6d4063449088caef (diff) | |
Merge pull request #17259 from twbs/v4gc
v4: Conditional predefined grid classes
Diffstat (limited to 'scss/_grid.scss')
| -rw-r--r-- | scss/_grid.scss | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scss/_grid.scss b/scss/_grid.scss index 1841b7faa7..2f58dc1ea8 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 |