diff options
| author | Martijn Cuppens <[email protected]> | 2019-12-19 11:18:05 +0100 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2020-02-12 19:45:54 +0200 |
| commit | f54b83073dd1bef471ddb2a4052307befd8ee065 (patch) | |
| tree | 16ac7895b9b625af3f90432649b028734eebb4e1 | |
| parent | dc64ff33148f7714d2ef3264a17d8b8c80e7ed29 (diff) | |
| download | bootstrap-f54b83073dd1bef471ddb2a4052307befd8ee065.tar.xz bootstrap-f54b83073dd1bef471ddb2a4052307befd8ee065.zip | |
Shorten if notations so that property order can be applied
| -rw-r--r-- | scss/_carousel.scss | 8 | ||||
| -rw-r--r-- | scss/_dropdown.scss | 4 | ||||
| -rw-r--r-- | scss/mixins/_buttons.scss | 11 |
3 files changed, 7 insertions, 16 deletions
diff --git a/scss/_carousel.scss b/scss/_carousel.scss index fb4ed894d..84ffd6cea 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -111,15 +111,11 @@ } .carousel-control-prev { left: 0; - @if $enable-gradients { - background-image: linear-gradient(90deg, rgba($black, .25), rgba($black, .001)); - } + background-image: if($enable-gradients, linear-gradient(90deg, rgba($black, .25), rgba($black, .001)), null); } .carousel-control-next { right: 0; - @if $enable-gradients { - background-image: linear-gradient(270deg, rgba($black, .25), rgba($black, .001)); - } + background-image: if($enable-gradients, linear-gradient(270deg, rgba($black, .25), rgba($black, .001)), null); } // Icons for within diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 4bfa8ac9d..8a7572828 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -166,9 +166,7 @@ pointer-events: none; background-color: transparent; // Remove CSS gradients if they're enabled - @if $enable-gradients { - background-image: none; - } + background-image: if($enable-gradients, none, null); } } diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index 8dc2c882a..92fe214d1 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -43,9 +43,8 @@ .show > &.dropdown-toggle { color: $active-color; background-color: $active-background; - @if $enable-gradients { - background-image: none; // Remove the gradient for the pressed/active state - } + // Remove CSS gradients if they're enabled + background-image: if($enable-gradients, none, null); border-color: $active-border; &:focus { @@ -62,11 +61,9 @@ &.disabled { color: $color; background-color: $background; - border-color: $border; // Remove CSS gradients if they're enabled - @if $enable-gradients { - background-image: none; - } + background-image: if($enable-gradients, none, null); + border-color: $border; } } |