aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMartijn Cuppens <[email protected]>2020-03-05 15:22:52 +0100
committerGitHub <[email protected]>2020-03-05 15:22:52 +0100
commitd9215ebd5a70ed84ea34337036a712d189fc6b91 (patch)
tree557f572c052140b181e0f729123660ff27e400a7 /scss
parent59c5d7599d5639b53c8d5ec53ad8258193482b93 (diff)
downloadbootstrap-d9215ebd5a70ed84ea34337036a712d189fc6b91.tar.xz
bootstrap-d9215ebd5a70ed84ea34337036a712d189fc6b91.zip
$link-decoration: underline affects some components (#30262)
Co-authored-by: Shohei Yoshida <[email protected]> Co-authored-by: Martijn Cuppens <[email protected]>
Diffstat (limited to 'scss')
-rw-r--r--scss/_buttons.scss1
-rw-r--r--scss/_dropdown.scss1
-rw-r--r--scss/_list-group.scss1
-rw-r--r--scss/_nav.scss1
-rw-r--r--scss/_pagination.scss1
5 files changed, 5 insertions, 0 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 9d4f3efc8..701c097cf 100644
--- 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 00f0cba6e..48cceed40 100644
--- 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 057eb8057..a7fa9f702 100644
--- 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 6d77aeba8..d82e9172d 100644
--- 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 d987d0fbe..9d728aad3 100644
--- 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;