Improve gradients

- Use a semitransparent gradient from light to dark which works on any background-color
- Store the gradient as a custom property (--bs-gradient)
- Remove `.bg-gradient-*` variants in favour of `.bg-gradient` which works even when `$enable-gradients` are enabled
- Add gradients to navbar, active page links and badges when gradients are enabled

14 files changed, 23 insertions, 28 deletions

diff --git a/scss/_badge.scss b/scss/_badge.scss
index baa80a75f..08df1b84a 100644
--- a/scss/_badge.scss
+++ b/scss/_badge.scss
@@ -14,6 +14,7 @@
   white-space: nowrap;
   vertical-align: baseline;
   @include border-radius($badge-border-radius);
+  @include gradient-bg();
 
   // Empty badges collapse automatically
   &:empty {
diff --git a/scss/_helpers.scss b/scss/_helpers.scss
index 06d931449..1fdbc2959 100644
--- a/scss/_helpers.scss
+++ b/scss/_helpers.scss
@@ -1,4 +1,3 @@
-@import "helpers/background";
 @import "helpers/clearfix";
 @import "helpers/colored-links";
 @import "helpers/embed";
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index b48761de9..8c00f31d2 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -30,7 +30,6 @@
 @import "mixins/table-variants";
 
 // Skins
-@import "mixins/background-variant";
 @import "mixins/border-radius";
 @import "mixins/box-shadow";
 @import "mixins/gradients";
diff --git a/scss/_nav.scss b/scss/_nav.scss
index e71f6839e..60ad27a55 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -82,7 +82,7 @@
   .nav-link.active,
   .show > .nav-link {
     color: $nav-pills-link-active-color;
-    background-color: $nav-pills-link-active-bg;
+    @include gradient-bg($nav-pills-link-active-bg);
   }
 }
 
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 129351d19..35d7c7b72 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -24,6 +24,7 @@
   padding-right: $navbar-padding-x; // default: null
   padding-bottom: $navbar-padding-y;
   padding-left: $navbar-padding-x; // default: null
+  @include gradient-bg();
 
   // Because flex properties aren't inherited, we need to redeclare these first
   // few properties so that content nested within behave properly.
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 3ef747d31..40b100b18 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -34,7 +34,7 @@
   &.active .page-link {
     z-index: 3;
     color: $pagination-active-color;
-    background-color: $pagination-active-bg;
+    @include gradient-bg($pagination-active-bg);
     border-color: $pagination-active-border-color;
   }
 
diff --git a/scss/_root.scss b/scss/_root.scss
index 86f7493c2..44eff1700 100644
--- a/scss/_root.scss
+++ b/scss/_root.scss
@@ -12,4 +12,5 @@
   // See https://github.com/sass/sass/issues/2383#issuecomment-336349172
   --bs-font-sans-serif: #{inspect($font-family-sans-serif)};
   --bs-font-monospace: #{inspect($font-family-monospace)};
+  --bs-gradient: #{$gradient};
 }
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 2d886bc4f..aa6c6eade 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -416,6 +416,11 @@ $utilities: map-merge(
         )
       )
     ),
+    "gradient": (
+      property: background-image,
+      class: bg,
+      values: (gradient: var(--bs-gradient))
+    ),
     "white-space": (
       property: white-space,
       class: text,
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 6bbcc066b..eeece96c0 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -222,6 +222,11 @@ $enable-negative-margins:     false !default;
 $enable-deprecation-messages: true !default;
 $enable-important-utilities:  true !default;
 
+// Gradient
+//
+// The gradient which is added to components if `$enable-gradients` is `true`
+// This gradient is also added to elements with `.bg-gradient`
+$gradient: linear-gradient(180deg, rgba($white, .15), rgba($white, 0)) !default;
 
 // Spacing
 //
diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss
index 31f554a41..7f4f3cb0f 100644
--- a/scss/forms/_form-check.scss
+++ b/scss/forms/_form-check.scss
@@ -53,7 +53,7 @@
 
     &[type="checkbox"] {
       @if $enable-gradients {
-        background-image: escape-svg($form-check-input-checked-bg-image), linear-gradient(180deg, lighten($form-check-input-checked-bg-color, 10%), $form-check-input-checked-bg-color);
+        background-image: escape-svg($form-check-input-checked-bg-image), var(--bs-gradient);
       } @else {
         background-image: escape-svg($form-check-input-checked-bg-image);
       }
@@ -61,7 +61,7 @@
 
     &[type="radio"] {
       @if $enable-gradients {
-        background-image: escape-svg($form-check-radio-checked-bg-image), linear-gradient(180deg, lighten($form-check-input-checked-bg-color, 10%), $form-check-input-checked-bg-color);
+        background-image: escape-svg($form-check-radio-checked-bg-image), var(--bs-gradient);
       } @else {
         background-image: escape-svg($form-check-radio-checked-bg-image);
       }
@@ -73,7 +73,7 @@
     border-color: $form-check-input-indeterminate-border-color;
 
     @if $enable-gradients {
-      background-image: escape-svg($form-check-input-indeterminate-bg-image), linear-gradient(180deg, lighten($form-check-input-checked-bg-color, 10%), $form-check-input-checked-bg-color);
+      background-image: escape-svg($form-check-input-indeterminate-bg-image), var(--bs-gradient);
     } @else {
       background-image: escape-svg($form-check-input-indeterminate-bg-image);
     }
diff --git a/scss/helpers/_background.scss b/scss/helpers/_background.scss
deleted file mode 100644
index 1c0a32a23..000000000
--- a/scss/helpers/_background.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@if $enable-gradients {
-  @each $color, $value in $theme-colors {
-    @include bg-gradient-variant(".bg-gradient-#{$color}", $value);
-  }
-}
diff --git a/scss/mixins/_background-variant.scss b/scss/mixins/_background-variant.scss
deleted file mode 100644
index 8a5bca4a9..000000000
--- a/scss/mixins/_background-variant.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// stylelint-disable declaration-no-important
-
-@mixin bg-gradient-variant($parent, $color) {
-  #{$parent} {
-    background-image: linear-gradient(180deg, mix($body-bg, $color, 15%), $color) !important;
-  }
-}
diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 516658371..99ca55984 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -97,7 +97,7 @@
       border-color: $color;
 
       &:checked {
-        @include gradient-bg(lighten($color, 10%), escape-svg($form-check-input-checked-bg-image));
+        background-color: $color;
       }
 
       &:focus {
diff --git a/scss/mixins/_gradients.scss b/scss/mixins/_gradients.scss
index cecabc913..8b87c0f15 100644
--- a/scss/mixins/_gradients.scss
+++ b/scss/mixins/_gradients.scss
@@ -1,14 +1,10 @@
 // Gradients
 
-@mixin gradient-bg($color, $foreground: null) {
+@mixin gradient-bg($color: null) {
+  background-color: $color;
+
   @if $enable-gradients {
-    @if $foreground {
-      background-image: $foreground, linear-gradient(180deg, mix($body-bg, $color, 15%), $color);
-    } @else {
-      background-image: linear-gradient(180deg, mix($body-bg, $color, 15%), $color);
-    }
-  } @else {
-    background-color: $color;
+    background-image: var(--bs-gradient);
   }
 }