Merge db08d41 into d7b22b7

twbs · Apr 29, 2024 · 230e092 · 230e092
2 parents d7b22b7 + db08d41
commit 230e092
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
@@ -29,7 +29,7 @@
   line-height: var(--#{$prefix}btn-line-height);
   color: var(--#{$prefix}btn-color);
   text-align: center;
-  text-decoration: if($link-decoration == none, null, none);
+  text-decoration: if($link-decoration == none, null, $link-decoration);
   white-space: $btn-white-space;
   vertical-align: middle;
   cursor: if($enable-button-pointers, pointer, null);
@@ -42,7 +42,7 @@
 
   &:hover {
     color: var(--#{$prefix}btn-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    @if ($link-hover-decoration != underline) { text-decoration: $link-hover-decoration;}
     background-color: var(--#{$prefix}btn-hover-bg);
     border-color: var(--#{$prefix}btn-hover-border-color);
   }

diff --git a/scss/_card.scss b/scss/_card.scss
@@ -91,7 +91,7 @@
 
 .card-link {
   &:hover {
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    @if ($link-hover-decoration != underline) { text-decoration: $link-hover-decoration;}
   }
 
   + .card-link {

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
@@ -180,7 +180,7 @@
   font-weight: $font-weight-normal;
   color: var(--#{$prefix}dropdown-link-color);
   text-align: inherit; // For `<button>`s
-  text-decoration: if($link-decoration == none, null, none);
+  text-decoration: if($link-decoration == none, null, $link-decoration);
   white-space: nowrap; // prevent links from randomly breaking onto new lines
   background-color: transparent; // For `<button>`s
   border: 0; // For `<button>`s
@@ -189,7 +189,7 @@
   &:hover,
   &:focus {
     color: var(--#{$prefix}dropdown-link-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    @if ($link-hover-decoration != underline) { text-decoration: $link-hover-decoration;}
     @include gradient-bg(var(--#{$prefix}dropdown-link-hover-bg));
   }
 

diff --git a/scss/_list-group.scss b/scss/_list-group.scss
@@ -77,7 +77,7 @@
   display: block;
   padding: var(--#{$prefix}list-group-item-padding-y) var(--#{$prefix}list-group-item-padding-x);
   color: var(--#{$prefix}list-group-color);
-  text-decoration: if($link-decoration == none, null, none);
+  text-decoration: if($link-decoration == none, null, $link-decoration);
   background-color: var(--#{$prefix}list-group-bg);
   border: var(--#{$prefix}list-group-border-width) solid var(--#{$prefix}list-group-border-color);
 

diff --git a/scss/_nav.scss b/scss/_nav.scss
@@ -27,15 +27,15 @@
   @include font-size(var(--#{$prefix}nav-link-font-size));
   font-weight: var(--#{$prefix}nav-link-font-weight);
   color: var(--#{$prefix}nav-link-color);
-  text-decoration: if($link-decoration == none, null, none);
+  text-decoration: if($link-decoration == none, null, $link-decoration);
   background: none;
   border: 0;
   @include transition($nav-link-transition);
 
   &:hover,
   &:focus {
     color: var(--#{$prefix}nav-link-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    @if ($link-hover-decoration != underline) { text-decoration: $link-hover-decoration;}
   }
 
   &:focus-visible {

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
@@ -68,13 +68,13 @@
   margin-right: var(--#{$prefix}navbar-brand-margin-end);
   @include font-size(var(--#{$prefix}navbar-brand-font-size));
   color: var(--#{$prefix}navbar-brand-color);
-  text-decoration: if($link-decoration == none, null, none);
+  text-decoration: if($link-decoration == none, null, $link-decoration);
   white-space: nowrap;
 
   &:hover,
   &:focus {
     color: var(--#{$prefix}navbar-brand-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    @if ($link-hover-decoration != underline) { text-decoration: $link-hover-decoration;}
   }
 }
 

diff --git a/scss/_pagination.scss b/scss/_pagination.scss
@@ -32,15 +32,15 @@
   padding: var(--#{$prefix}pagination-padding-y) var(--#{$prefix}pagination-padding-x);
   @include font-size(var(--#{$prefix}pagination-font-size));
   color: var(--#{$prefix}pagination-color);
-  text-decoration: if($link-decoration == none, null, none);
+  text-decoration: if($link-decoration == none, null, $link-decoration);
   background-color: var(--#{$prefix}pagination-bg);
   border: var(--#{$prefix}pagination-border-width) solid var(--#{$prefix}pagination-border-color);
   @include transition($pagination-transition);
 
   &:hover {
     z-index: 2;
     color: var(--#{$prefix}pagination-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    @if ($link-hover-decoration != underline) { text-decoration: $link-hover-decoration;}
     background-color: var(--#{$prefix}pagination-hover-bg);
     border-color: var(--#{$prefix}pagination-hover-border-color);
   }