aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Cuppens <[email protected]>2020-03-20 09:35:55 +0100
committerMartijn Cuppens <[email protected]>2020-03-20 09:35:55 +0100
commit7fc4037a02910fa7590fa9e21387fb6e3d325755 (patch)
tree7f9bca7a0a5cec2864e3b50c7b7151c3b8d61a4a
parent39c11c6b3f0c47629a723c6a7a5c3d3f71827b7f (diff)
downloadbootstrap-7fc4037a02910fa7590fa9e21387fb6e3d325755.tar.xz
bootstrap-7fc4037a02910fa7590fa9e21387fb6e3d325755.zip
Remove redundant text decoration from hover states
-rw-r--r--scss/_buttons.scss2
-rw-r--r--scss/_dropdown.scss2
-rw-r--r--scss/_nav.scss2
-rw-r--r--scss/_pagination.scss2
-rw-r--r--scss/_variables.scss2
-rw-r--r--site/assets/scss/_sidebar.scss1
6 files changed, 5 insertions, 6 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 701c097cf..1b27a7d34 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -21,7 +21,7 @@
&:hover {
color: $body-color;
- text-decoration: none;
+ text-decoration: if($link-hover-decoration == underline, none, null);
}
&:focus,
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 48cceed40..3290f22cb 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -150,7 +150,7 @@
&:hover,
&:focus {
color: $dropdown-link-hover-color;
- text-decoration: none;
+ text-decoration: if($link-hover-decoration == underline, none, null);
@include gradient-bg($dropdown-link-hover-bg);
}
diff --git a/scss/_nav.scss b/scss/_nav.scss
index 62013cdad..81eec4ed3 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -18,7 +18,7 @@
&:hover,
&:focus {
- text-decoration: none;
+ text-decoration: if($link-hover-decoration == underline, none, null);
}
// Disabled state lightens text
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 9d728aad3..3ef747d31 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -14,7 +14,7 @@
&:hover {
z-index: 2;
color: $pagination-hover-color;
- text-decoration: none;
+ text-decoration: if($link-hover-decoration == underline, none, null);
background-color: $pagination-hover-bg;
border-color: $pagination-hover-border-color;
}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 916b42097..39b9f5d22 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -251,7 +251,7 @@ $body-text-align: null !default;
$link-color: $primary !default;
$link-decoration: underline !default;
$link-hover-color: darken($link-color, 15%) !default;
-$link-hover-decoration: $link-decoration !default;
+$link-hover-decoration: null !default;
// Darken percentage for links with `.text-*` class (e.g. `.text-success`)
$emphasized-link-hover-darken-percentage: 15% !default;
diff --git a/site/assets/scss/_sidebar.scss b/site/assets/scss/_sidebar.scss
index e78119471..4348615d6 100644
--- a/site/assets/scss/_sidebar.scss
+++ b/site/assets/scss/_sidebar.scss
@@ -70,7 +70,6 @@
&:hover,
&:focus {
color: rgba($black, .85);
- text-decoration: none;
background-color: rgba($bd-purple-bright, .1);
}
}