Shorten if notations so that property order can be applied

diff --git a/scss/_carousel.scss b/scss/_carousel.scss
index fb4ed894d3548c9aa662a8c0935f3f5045f929fd..84ffd6cea1d1cea03e5c251d08bda9cca90397e0 100644 (file)
--- 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 4bfa8ac9dfc365e4ff23970d89bface4cace7cfe..8a7572828de70d2aad3d9b63d645a63a14a46665 100644 (file)
--- 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 8dc2c882a78d0eefc7ce3e1d9e2e9485e0cc9df2..92fe214d14aea3e170b470428f07224919a91530 100644 (file)
--- 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;
   }
 }