Remove redundant text decoration from hover states

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 701c097cf3de548f255953ead383bbc8256aaa26..1b27a7d34f3a020f77366a25ee3a8df920e747ad 100644 (file)
--- 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 48cceed40fb90ead13bc24bda1ce24650adc6855..3290f22cbb358c1a49161a2032d78f43446fd960 100644 (file)
--- 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 62013cdada0e085c8bdff49bc235f13653ac64bc..81eec4ed3fee6211e8be57d8a0aa0d215775eca7 100644 (file)
--- 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 9d728aad32503929837066bc17a1e1cd28ce2a98..3ef747d31183ee5954f3f9cf31664c7e943d0a66 100644 (file)
--- 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 916b4209756b5bd2e1a44e0fc9aeadfcfb832fda..39b9f5d229bdff443de5240ca0d036bf54638f0a 100644 (file)
--- 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 e78119471324be47ae06615c2342e977837407a1..4348615d6287d44bbeb16df79f8039b6255359f3 100644 (file)
--- 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);
     }
   }