From 19352637bc54eae93b91eacbd3bdc8af9f463219 Mon Sep 17 00:00:00 2001
From: jonnysp <jonnyspitzner@googlemail.com>
Date: Tue, 28 Mar 2023 15:39:29 +0200
Subject: [PATCH 1/3] link-decoration

---
 scss/_buttons.scss    | 8 ++++----
 scss/_card.scss       | 2 +-
 scss/_dropdown.scss   | 4 ++--
 scss/_list-group.scss | 2 +-
 scss/_nav.scss        | 4 ++--
 scss/_navbar.scss     | 4 ++--
 scss/_pagination.scss | 4 ++--
 scss/_reboot.scss     | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index cbc0784a4d..7fe8f4ed2b 100644
--- 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: none;
   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);
+    text-decoration: none;
     background-color: var(--#{$prefix}btn-hover-bg);
     border-color: var(--#{$prefix}btn-hover-border-color);
   }
@@ -172,14 +172,14 @@
   --#{$prefix}btn-box-shadow: 0 0 0 #000; // Can't use `none` as keyword negates all values when used with multiple shadows
   --#{$prefix}btn-focus-shadow-rgb: #{to-rgb(mix(color-contrast($link-color), $link-color, 15%))};
 
-  text-decoration: $link-decoration;
+  text-decoration: var(--#{$prefix}link-decoration);
   @if $enable-gradients {
     background-image: none;
   }
 
   &:hover,
   &:focus-visible {
-    text-decoration: $link-hover-decoration;
+    text-decoration: var(--#{$prefix}link-hover-decoration);
   }
 
   &:focus-visible {
diff --git a/scss/_card.scss b/scss/_card.scss
index d3535a98b7..0912e3fcf5 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -91,7 +91,7 @@
 
 .card-link {
   &:hover {
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    text-decoration: none;
   }
 
   + .card-link {
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 587ebb487c..d5adc3f585 100644
--- 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: none;
   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);
+    text-decoration: none;
     @include gradient-bg(var(--#{$prefix}dropdown-link-hover-bg));
   }
 
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 455531eec0..8d70937a34 100644
--- 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: none;
   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
index aedbdba540..e4f9ca52ef 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -27,7 +27,7 @@
   @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: none;
   background: none;
   border: 0;
   @include transition($nav-link-transition);
@@ -35,7 +35,7 @@
   &:hover,
   &:focus {
     color: var(--#{$prefix}nav-link-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    text-decoration: none;
   }
 
   &:focus-visible {
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 76ac085c10..cad530ae7c 100644
--- 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: none;
   white-space: nowrap;
 
   &:hover,
   &:focus {
     color: var(--#{$prefix}navbar-brand-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    text-decoration: none;
   }
 }
 
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index f275a62eb4..470019b025 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -32,7 +32,7 @@
   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: none;
   background-color: var(--#{$prefix}pagination-bg);
   border: var(--#{$prefix}pagination-border-width) solid var(--#{$prefix}pagination-border-color);
   @include transition($pagination-transition);
@@ -40,7 +40,7 @@
   &:hover {
     z-index: 2;
     color: var(--#{$prefix}pagination-hover-color);
-    text-decoration: if($link-hover-decoration == underline, none, null);
+    text-decoration: none;
     background-color: var(--#{$prefix}pagination-hover-bg);
     border-color: var(--#{$prefix}pagination-hover-border-color);
   }
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 305740587b..189e6edd17 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -242,11 +242,11 @@ sup { top: -.5em; }
 
 a {
   color: rgba(var(--#{$prefix}link-color-rgb), var(--#{$prefix}link-opacity, 1));
-  text-decoration: $link-decoration;
+  text-decoration: var(--#{$prefix}link-decoration);
 
   &:hover {
     --#{$prefix}link-color-rgb: var(--#{$prefix}link-hover-color-rgb);
-    text-decoration: $link-hover-decoration;
+    text-decoration: var(--#{$prefix}link-hover-decoration);
   }
 }
 

From edfc89af22211f156a97a8a62969b225e14be43a Mon Sep 17 00:00:00 2001
From: jonnysp <jonnyspitzner@googlemail.com>
Date: Tue, 28 Mar 2023 15:50:07 +0200
Subject: [PATCH 2/3] hover-decoration

---
 scss/_root.scss      | 7 ++-----
 scss/_variables.scss | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scss/_root.scss b/scss/_root.scss
index e7cff70561..fadad032df 100644
--- a/scss/_root.scss
+++ b/scss/_root.scss
@@ -87,11 +87,8 @@
 
   --#{$prefix}link-hover-color: #{$link-hover-color};
   --#{$prefix}link-hover-color-rgb: #{to-rgb($link-hover-color)};
-
-  @if $link-hover-decoration != null {
-    --#{$prefix}link-hover-decoration: #{$link-hover-decoration};
-  }
-
+  --#{$prefix}link-hover-decoration: #{$link-hover-decoration};
+  
   --#{$prefix}code-color: #{$code-color};
   --#{$prefix}highlight-bg: #{$mark-bg};
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index eed9a13535..9b9c06f112 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -454,7 +454,7 @@ $link-color:                              $primary !default;
 $link-decoration:                         underline !default;
 $link-shade-percentage:                   20% !default;
 $link-hover-color:                        shift-color($link-color, $link-shade-percentage) !default;
-$link-hover-decoration:                   null !default;
+$link-hover-decoration:                   underline !default;
 
 $stretched-link-pseudo-element:           after !default;
 $stretched-link-z-index:                  1 !default;

From ea2b9dd01164a625c04ea3db0096a9bad4d9738b Mon Sep 17 00:00:00 2001
From: jonnysp <jonnyspitzner@googlemail.com>
Date: Tue, 28 Mar 2023 15:53:04 +0200
Subject: [PATCH 3/3] fix lint

---
 scss/_root.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scss/_root.scss b/scss/_root.scss
index fadad032df..f5c3cc2d8c 100644
--- a/scss/_root.scss
+++ b/scss/_root.scss
@@ -88,7 +88,6 @@
   --#{$prefix}link-hover-color: #{$link-hover-color};
   --#{$prefix}link-hover-color-rgb: #{to-rgb($link-hover-color)};
   --#{$prefix}link-hover-decoration: #{$link-hover-decoration};
-  
   --#{$prefix}code-color: #{$code-color};
   --#{$prefix}highlight-bg: #{$mark-bg};