$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 bf7814865ec27cbc259f9be28707378650d23ad4..218a2782d36ab2dada03ba89e000a3d25390691a 100644 (file)
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -10,6 +10,7 @@
   font-weight: $btn-font-weight;
   color: $body-color;
   text-align: center;
+  text-decoration: if($link-decoration == none, null, none);
   white-space: $btn-white-space;
   vertical-align: middle;
   user-select: none;

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index bf458ecf743b6c70c48319be5bcd1814f4158de2..2ab7536e134490dd9912b1dc02618de4f6310b66 100644 (file)
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -128,6 +128,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 468c2e31acab61d406a5fe7338e7f2041dcff1cd..2af8af23b9804a713ffed81ef615f1ed31609841 100644 (file)
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -46,6 +46,7 @@
   display: block;
   padding: $list-group-item-padding-y $list-group-item-padding-x;
   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 667d68272150978b29599d69e52bb72c9854a9cc..b8b73bb7ab2628554d754f4c40a7c4daf81ee390 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);
 
   @include hover-focus() {
     text-decoration: none;

diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 953a35a7feccfb3d48e7f185e207fa5f41431f88..d7d553ccad3a77cead81ff1a622ae16304607426 100644 (file)
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -11,6 +11,7 @@
   margin-left: -$pagination-border-width;
   line-height: $pagination-line-height;
   color: $pagination-color;
+  text-decoration: if($link-decoration == none, null, none);
   background-color: $pagination-bg;
   border: $pagination-border-width solid $pagination-border-color;