From f3692bf517a71d2a79c3ff0ad00c727d15a17c69 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Mar 2020 09:35:36 -0700 Subject: [PATCH 1/6] Enable underlines for links --- scss/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 71fabc58db..916b420975 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -249,9 +249,9 @@ $body-text-align: null !default; // Style anchor elements. $link-color: $primary !default; -$link-decoration: none !default; +$link-decoration: underline !default; $link-hover-color: darken($link-color, 15%) !default; -$link-hover-decoration: underline !default; +$link-hover-decoration: $link-decoration !default; // Darken percentage for links with `.text-*` class (e.g. `.text-success`) $emphasized-link-hover-darken-percentage: 15% !default; From a66e5e6643104607233b79efb2a27eeab10fc236 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Mar 2020 09:35:46 -0700 Subject: [PATCH 2/6] Remove links from docs sidebar --- site/assets/scss/_sidebar.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/assets/scss/_sidebar.scss b/site/assets/scss/_sidebar.scss index c2baad1cda..18236fb05d 100644 --- a/site/assets/scss/_sidebar.scss +++ b/site/assets/scss/_sidebar.scss @@ -24,6 +24,7 @@ padding: .25rem .625rem .25rem .5rem; font-weight: 600; color: rgba($black, .65); + text-decoration: none; @include border-radius(.25rem); > * { pointer-events: none; } @@ -64,6 +65,7 @@ padding: .25rem .5rem; @include font-size(.875rem); color: rgba($black, .65); + text-decoration: none; @include border-radius(.25rem); &:hover, From 685da5c8020dc7547647b16418268367064a4d3d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Mar 2020 12:19:39 -0700 Subject: [PATCH 3/6] supress underline on toc --- site/assets/scss/_toc.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/assets/scss/_toc.scss b/site/assets/scss/_toc.scss index f942f6210e..d31437edb0 100644 --- a/site/assets/scss/_toc.scss +++ b/site/assets/scss/_toc.scss @@ -14,6 +14,10 @@ list-style-type: disc; } + a { + text-decoration: none; + } + a code { font: inherit; } From 1e0575ced2856d54a08fa7130fdc364b2de4fd76 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Mar 2020 12:19:53 -0700 Subject: [PATCH 4/6] remove dupe text-decoration --- site/assets/scss/_sidebar.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/site/assets/scss/_sidebar.scss b/site/assets/scss/_sidebar.scss index 18236fb05d..e781194713 100644 --- a/site/assets/scss/_sidebar.scss +++ b/site/assets/scss/_sidebar.scss @@ -32,7 +32,6 @@ &:hover, &:focus { color: rgba($black, .85); - text-decoration: none; background-color: rgba($bd-purple-bright, .1); } } From 39c11c6b3f0c47629a723c6a7a5c3d3f71827b7f Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Fri, 20 Mar 2020 09:33:53 +0100 Subject: [PATCH 5/6] Restore hover text decoration on toc links --- site/assets/scss/_toc.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/assets/scss/_toc.scss b/site/assets/scss/_toc.scss index d31437edb0..9e7de3c2b9 100644 --- a/site/assets/scss/_toc.scss +++ b/site/assets/scss/_toc.scss @@ -1,4 +1,4 @@ -// stylelint-disable selector-max-type, selector-max-combinators, selector-max-compound-selectors +// stylelint-disable selector-max-type, selector-max-compound-selectors .bd-toc nav { padding-top: .125em; @@ -14,7 +14,7 @@ list-style-type: disc; } - a { + a:not(:hover) { text-decoration: none; } From 7fc4037a02910fa7590fa9e21387fb6e3d325755 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Fri, 20 Mar 2020 09:35:55 +0100 Subject: [PATCH 6/6] Remove redundant text decoration from hover states --- scss/_buttons.scss | 2 +- scss/_dropdown.scss | 2 +- scss/_nav.scss | 2 +- scss/_pagination.scss | 2 +- scss/_variables.scss | 2 +- site/assets/scss/_sidebar.scss | 1 - 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 701c097cf3..1b27a7d34f 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 48cceed40f..3290f22cbb 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 62013cdada..81eec4ed3f 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 9d728aad32..3ef747d311 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 916b420975..39b9f5d229 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 e781194713..4348615d62 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); } }