$link-decoration: underline affects some components (#30262)

Co-authored-by: Shohei Yoshida <fellows3@gmail.com>
Co-authored-by: Martijn Cuppens <martijn.cuppens@gmail.com>

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 9d4f3efc8b0dab9e724cc28b14680df55bc22f4a..701c097cf3de548f255953ead383bbc8256aaa26 100644 (file)
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -9,6 +9,7 @@
   line-height: $btn-line-height;
   color: $body-color;
   text-align: center;
+  text-decoration: if($link-decoration == none, null, none);
   white-space: $btn-white-space;
   vertical-align: middle;
   cursor: if($enable-pointer-cursor-for-buttons, pointer, null);

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 00f0cba6e822a1525954847f153635c065e6f6cf..48cceed40fb90ead13bc24bda1ce24650adc6855 100644 (file)
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -130,6 +130,7 @@
   font-weight: $font-weight-normal;
   color: $dropdown-link-color;
   text-align: inherit; // For `<button>`s
+  text-decoration: if($link-decoration == none, null, none);
   white-space: nowrap; // prevent links from randomly breaking onto new lines
   background-color: transparent; // For `<button>`s
   border: 0; // For `<button>`s

diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 057eb8057dab045d40c639b6f0962e3f45048b28..a7fa9f70257dc9a4283a69eaf67f319d8704591d 100644 (file)
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -48,6 +48,7 @@
   padding: $list-group-item-padding-y $list-group-item-padding-x;
   margin-bottom: 0; // for <label> variations
   color: $list-group-color;
+  text-decoration: if($link-decoration == none, null, none);
   background-color: $list-group-bg;
   border: $list-group-border-width solid $list-group-border-color;
 

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 6d77aeba868769d2ad299d69a64e6affa704d0bd..d82e9172dc1127a6cf7edd87da27b6613164dc59 100644 (file)
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -14,6 +14,7 @@
 .nav-link {
   display: block;
   padding: $nav-link-padding-y $nav-link-padding-x;
+  text-decoration: if($link-decoration == none, null, none);
 
   &:hover,
   &:focus {

diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index d987d0fbec3bae7c965521b55cdc8f5ff281b7c8..9d728aad32503929837066bc17a1e1cd28ce2a98 100644 (file)
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -7,6 +7,7 @@
   position: relative;
   display: block;
   color: $pagination-color;
+  text-decoration: if($link-decoration == none, null, none);
   background-color: $pagination-bg;
   border: $pagination-border-width solid $pagination-border-color;