From 99503c24765a88d456ef156acb1a9045cd88c8f7 Mon Sep 17 00:00:00 2001 From: christian medders Date: Fri, 12 Apr 2024 15:10:50 -0400 Subject: [PATCH 01/12] Vote-939: update to dropdown bg-color --- .../sass/uswds-overrides/usa-language-selector.scss | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss index d7803d916..81ecba91a 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss @@ -33,6 +33,7 @@ @include u-width('auto'); @include u-radius('sm'); @include u-text('no-wrap'); + background-color: $base-dark; @include at-media-max('tablet') { overflow: auto; @@ -58,4 +59,12 @@ @include at-media('tablet') { position: absolute; } -} \ No newline at end of file +} + + +// #2e598a +// button:not([disabled]):focus + +// .usa-language__link:not([disabled]):focus { +// outline: #2e598a; +// } \ No newline at end of file From ba1bece63ab9038605dd628262f3fe5307797b62 Mon Sep 17 00:00:00 2001 From: christian medders Date: Fri, 12 Apr 2024 15:11:09 -0400 Subject: [PATCH 02/12] Vote-939: Update to focus outline --- .../custom/votegov/src/sass/uswds-overrides/usa-button.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss index 213309ec2..83a14b870 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss @@ -22,6 +22,7 @@ &.usa-focus, &.usa-button--hover { background-color: $base-primary-hover; + outline: .25rem solid $base-primary-hover; } &.usa-button--secondary { From 979f73426e36e0e82336141a7599402ac3e8b9dd Mon Sep 17 00:00:00 2001 From: christian medders Date: Mon, 15 Apr 2024 13:52:38 -0400 Subject: [PATCH 03/12] Removed commented out code --- .../src/sass/uswds-overrides/usa-language-selector.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss index 81ecba91a..f0091b25d 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss @@ -60,11 +60,3 @@ position: absolute; } } - - -// #2e598a -// button:not([disabled]):focus - -// .usa-language__link:not([disabled]):focus { -// outline: #2e598a; -// } \ No newline at end of file From 459a8458d657fc7c440aa7f55c73322b71bfcb3b Mon Sep 17 00:00:00 2001 From: christian medders Date: Mon, 15 Apr 2024 13:53:01 -0400 Subject: [PATCH 04/12] Added border bottom right radius of 0 --- .../custom/votegov/src/sass/uswds-overrides/usa-button.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss index 83a14b870..ace77f332 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss @@ -23,6 +23,7 @@ &.usa-button--hover { background-color: $base-primary-hover; outline: .25rem solid $base-primary-hover; + border-bottom-right-radius: 0; } &.usa-button--secondary { From da06826b33afa911e8a3a0a366fc0a3daecdbaa7 Mon Sep 17 00:00:00 2001 From: christian medders Date: Mon, 15 Apr 2024 14:19:34 -0400 Subject: [PATCH 05/12] Moved border radius to just the language selector --- .../custom/votegov/src/sass/uswds-overrides/usa-button.scss | 1 - .../src/sass/uswds-overrides/usa-language-selector.scss | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss index ace77f332..83a14b870 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss @@ -23,7 +23,6 @@ &.usa-button--hover { background-color: $base-primary-hover; outline: .25rem solid $base-primary-hover; - border-bottom-right-radius: 0; } &.usa-button--secondary { diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss index f0091b25d..1f33dc87f 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss @@ -60,3 +60,7 @@ position: absolute; } } + +.usa-button.usa-language__link:focus { + border-bottom-right-radius: 0; +} From 8092defa967b9596f1d502e2179a9eb1289b6533 Mon Sep 17 00:00:00 2001 From: christian medders Date: Wed, 17 Apr 2024 12:43:17 -0400 Subject: [PATCH 06/12] Adding border radius 0 to dropdown --- .../src/sass/uswds-overrides/usa-language-selector.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss index 1f33dc87f..f90939a8b 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss @@ -31,9 +31,9 @@ .usa-language__submenu { @include u-padding(2.5); @include u-width('auto'); - @include u-radius('sm'); @include u-text('no-wrap'); background-color: $base-dark; + border-radius: 2px 0 2px 2px; @include at-media-max('tablet') { overflow: auto; @@ -63,4 +63,5 @@ .usa-button.usa-language__link:focus { border-bottom-right-radius: 0; + border-bottom-left-radius: 0; } From 7fc50caf0a868418b6bcf58954836bdb082618cc Mon Sep 17 00:00:00 2001 From: christian medders Date: Thu, 18 Apr 2024 10:05:58 -0400 Subject: [PATCH 07/12] Move focus to its own style --- .../custom/votegov/src/sass/uswds-overrides/usa-button.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss index 83a14b870..a5bca4b3e 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss @@ -18,10 +18,13 @@ } &:hover, - &:focus, &.usa-focus, &.usa-button--hover { background-color: $base-primary-hover; + } + + &:focus { + background-color: $base-primary-hover; outline: .25rem solid $base-primary-hover; } From 4cb3dd8dd615db2591f67862fa8acace9cb410f9 Mon Sep 17 00:00:00 2001 From: christian medders Date: Thu, 18 Apr 2024 14:39:34 -0400 Subject: [PATCH 08/12] vote-939: Update to styles to just target lang button --- .../votegov/src/sass/uswds-overrides/usa-button.scss | 6 +----- .../src/sass/uswds-overrides/usa-language-selector.scss | 9 ++++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss index a5bca4b3e..e86b138d5 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss @@ -19,15 +19,11 @@ &:hover, &.usa-focus, + &:focus &.usa-button--hover { background-color: $base-primary-hover; } - &:focus { - background-color: $base-primary-hover; - outline: .25rem solid $base-primary-hover; - } - &.usa-button--secondary { background-color: $ac-warm; diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss index ab318c2ef..9c0e496e1 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss @@ -58,7 +58,10 @@ } -.usa-button.usa-language__link:focus { - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; +.usa-button.usa-language__link { + &[aria-expanded="true"]{ + background-color: $base-dark; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } } From b1296e8ffc0e291700e1985a3c4ee6b1dd39b38a Mon Sep 17 00:00:00 2001 From: christian medders Date: Thu, 18 Apr 2024 14:43:28 -0400 Subject: [PATCH 09/12] Moving focus back to orginal spot --- .../custom/votegov/src/sass/uswds-overrides/usa-button.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss index e86b138d5..f3cedc730 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss @@ -18,8 +18,8 @@ } &:hover, - &.usa-focus, &:focus + &.usa-focus, &.usa-button--hover { background-color: $base-primary-hover; } From c9f2c15c7ea220b2a0abc884a133a08f02549103 Mon Sep 17 00:00:00 2001 From: christian medders Date: Thu, 18 Apr 2024 14:45:48 -0400 Subject: [PATCH 10/12] Code refinements --- .../custom/votegov/src/sass/uswds-overrides/usa-button.scss | 2 +- .../src/sass/uswds-overrides/usa-language-selector.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss index f3cedc730..213309ec2 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-button.scss @@ -18,7 +18,7 @@ } &:hover, - &:focus + &:focus, &.usa-focus, &.usa-button--hover { background-color: $base-primary-hover; diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss index 9c0e496e1..d4d0927d4 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss @@ -34,8 +34,9 @@ @include u-padding(2.5); @include u-width('auto'); @include u-text('no-wrap'); + @include u-radius('sm'); background-color: $base-dark; - border-radius: 2px 0 2px 2px; + // border-radius: 2px 0 2px 2px; @include at-media-max('tablet') { overflow: auto; From 97337d3dfbba257a587b32513364e17bd828650c Mon Sep 17 00:00:00 2001 From: christian medders Date: Thu, 18 Apr 2024 14:49:46 -0400 Subject: [PATCH 11/12] More refinements --- .../votegov/src/sass/uswds-overrides/usa-language-selector.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss index d4d0927d4..32938ee54 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss @@ -34,9 +34,7 @@ @include u-padding(2.5); @include u-width('auto'); @include u-text('no-wrap'); - @include u-radius('sm'); background-color: $base-dark; - // border-radius: 2px 0 2px 2px; @include at-media-max('tablet') { overflow: auto; From 411ac3f050e39b8a00bc3d4396540a44a97db581 Mon Sep 17 00:00:00 2001 From: christian medders Date: Thu, 18 Apr 2024 14:53:39 -0400 Subject: [PATCH 12/12] Adding back radius to prevent regressions --- .../votegov/src/sass/uswds-overrides/usa-language-selector.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss index 32938ee54..fb453fee1 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-language-selector.scss @@ -33,6 +33,7 @@ .usa-language__submenu { @include u-padding(2.5); @include u-width('auto'); + @include u-radius('sm'); @include u-text('no-wrap'); background-color: $base-dark;