From 2ade90cbed499c31edec404f9c83d403d9a0cfdf Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Wed, 27 Jul 2022 11:36:27 +0200 Subject: [PATCH 1/6] Remove hover for active tab --- scss/_nav.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index 5089f46f08..bbd1a046cf 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -127,7 +127,7 @@ // stylelint-disable-next-line function-disallowed-list border-width: 0 0 calc(var(--#{$prefix}nav-tabs-border-width) * 4); - &:hover, + &:not(.active):hover, &:focus { color: $accessible-orange; background: none; From d6ccffa8613afaf8dcc2d59046952a603d8be021 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Thu, 28 Jul 2022 19:45:27 +0200 Subject: [PATCH 2/6] Fix active state --- scss/_nav.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_nav.scss b/scss/_nav.scss index bbd1a046cf..2bd49c8730 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -136,6 +136,7 @@ } &.active { + color: var(--#{$prefix}nav-link-color); border-bottom-color: $accessible-orange; } } From aadf8c1b6b2289b337cf73e80ac348432fac18a8 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Fri, 29 Jul 2022 17:00:20 +0200 Subject: [PATCH 3/6] Fix for new version of the issue --- scss/_nav.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index 2bd49c8730..cbbcc2ef1f 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -127,7 +127,7 @@ // stylelint-disable-next-line function-disallowed-list border-width: 0 0 calc(var(--#{$prefix}nav-tabs-border-width) * 4); - &:not(.active):hover, + &:hover, &:focus { color: $accessible-orange; background: none; @@ -135,8 +135,11 @@ outline-color: currentcolor; } + &.active:hover { + color: var(--#{$prefix}nav-tabs-link-active-color); + } + &.active { - color: var(--#{$prefix}nav-link-color); border-bottom-color: $accessible-orange; } } From 43e85231e5927ebc6091e25c38ada3c3695cbecd Mon Sep 17 00:00:00 2001 From: "louismaxime.piton" Date: Fri, 16 Dec 2022 10:45:56 +0100 Subject: [PATCH 4/6] Proposal --- scss/_nav.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index cbbcc2ef1f..b280e53de8 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -135,11 +135,8 @@ outline-color: currentcolor; } - &.active:hover { - color: var(--#{$prefix}nav-tabs-link-active-color); - } - &.active { + color: var(--#{$prefix}nav-tabs-link-active-color); border-bottom-color: $accessible-orange; } } From 9682f64209dab4451ae91354974299e1294036e5 Mon Sep 17 00:00:00 2001 From: "louismaxime.piton" Date: Fri, 16 Dec 2022 11:12:31 +0100 Subject: [PATCH 5/6] Fix after merge --- scss/_nav.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index da08d35abb..1de0c29578 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -126,14 +126,13 @@ --#{$prefix}nav-tabs-link-hover-color: #{$accessible-orange}; --#{$prefix}nav-tabs-link-border-width: 0 0 calc(var(--#{$prefix}nav-tabs-border-width) * 4); // stylelint-disable-line function-disallowed-list --#{$prefix}nav-tabs-link-hover-border-color: transparent; - --#{$prefix}nav-tabs-link-active-color: #{$nav-tabs-link-active-color}; + --#{$prefix}nav-tabs-link-active-color: #{$black}; --#{$prefix}nav-tabs-link-active-border-color: #{$accessible-orange}; // scss-docs-end nav-tabs-light-css-vars .nav-link:hover, .nav-link:focus { - color: var(--#{$prefix}nav-tabs-link-hover-color); - outline-color: currentcolor; + outline-color: $accessible-orange; } } // End mod From a03e08b124ea7af3f50ca2b63ff79c08c34984b2 Mon Sep 17 00:00:00 2001 From: "louismaxime.piton" Date: Fri, 16 Dec 2022 11:26:56 +0100 Subject: [PATCH 6/6] Fix(review) --- scss/_nav.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index 1de0c29578..2161fcb17c 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -126,7 +126,6 @@ --#{$prefix}nav-tabs-link-hover-color: #{$accessible-orange}; --#{$prefix}nav-tabs-link-border-width: 0 0 calc(var(--#{$prefix}nav-tabs-border-width) * 4); // stylelint-disable-line function-disallowed-list --#{$prefix}nav-tabs-link-hover-border-color: transparent; - --#{$prefix}nav-tabs-link-active-color: #{$black}; --#{$prefix}nav-tabs-link-active-border-color: #{$accessible-orange}; // scss-docs-end nav-tabs-light-css-vars