diff options
| author | Mark Otto <[email protected]> | 2015-09-22 15:26:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-09-22 15:26:28 -0700 |
| commit | 918d0c712294584f69c2b34b207e2b70e1d9140d (patch) | |
| tree | beb3ba8eaccb606ed6143a7544e60aed18275560 | |
| parent | c21679ceeb0b313f5a87a3de5e7365c6f59f428d (diff) | |
| parent | d73d79a7a013ca147f9e6a94d16ff9bf86c5bf91 (diff) | |
| download | bootstrap-918d0c712294584f69c2b34b207e2b70e1d9140d.tar.xz bootstrap-918d0c712294584f69c2b34b207e2b70e1d9140d.zip | |
Merge pull request #17589 from vsn4ik/use_scss_if_not
v4 - Use "@if not $bool" expression
| -rw-r--r-- | scss/mixins/_grid.scss | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss index 585c80f27..3fc45f41e 100644 --- a/scss/mixins/_grid.scss +++ b/scss/mixins/_grid.scss @@ -7,8 +7,7 @@ margin-left: auto; padding-left: ($gutter / 2); padding-right: ($gutter / 2); - @if $enable-flex { - } @else { + @if not $enable-flex { @include clearfix(); } } @@ -36,9 +35,7 @@ @mixin make-col($gutter: $grid-gutter-width) { position: relative; - @if $enable-flex { - // Do nothing - } @else { + @if not $enable-flex { float: left; } min-height: 1px; |