From 94573727486e5e693a4250bdd0cb1f9823debe4b Mon Sep 17 00:00:00 2001
From: Caryl Wyatt <carylw@hathitrust.org>
Date: Mon, 5 Aug 2024 15:01:58 -0400
Subject: [PATCH 1/4] fix focus styles in collections toolbar

---
 src/js/components/CollectionsToolbar/index.svelte | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/js/components/CollectionsToolbar/index.svelte b/src/js/components/CollectionsToolbar/index.svelte
index 0fa22b4..3b79343 100644
--- a/src/js/components/CollectionsToolbar/index.svelte
+++ b/src/js/components/CollectionsToolbar/index.svelte
@@ -347,4 +347,7 @@
 <CollectionEditModal bind:this={modal} {userIsAnonymous} {c} {cn} {desc} {contributorName} {shared} {submitAction} />
 
 <style>
+  .bg-secondary button:not(.dropdown-item):focus-visible, .bg-secondary .form-select:focus-visible {
+    outline-offset:0;
+  }
 </style>

From d87a0ba0c78ccd63c6f7fed6d5158f20a5bbc744 Mon Sep 17 00:00:00 2001
From: Caryl Wyatt <carylw@hathitrust.org>
Date: Mon, 5 Aug 2024 15:22:23 -0400
Subject: [PATCH 2/4] remove orange focus outline

---
 src/js/components/CollectionsToolbar/index.svelte | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/js/components/CollectionsToolbar/index.svelte b/src/js/components/CollectionsToolbar/index.svelte
index 3b79343..0b4602e 100644
--- a/src/js/components/CollectionsToolbar/index.svelte
+++ b/src/js/components/CollectionsToolbar/index.svelte
@@ -350,4 +350,7 @@
   .bg-secondary button:not(.dropdown-item):focus-visible, .bg-secondary .form-select:focus-visible {
     outline-offset:0;
   }
+  .form-select:focus {
+    border-color: transparent;
+  }
 </style>

From c4bd9af5ccdc664087bcc74dfbc0984ba7365038 Mon Sep 17 00:00:00 2001
From: Caryl Wyatt <carylw@hathitrust.org>
Date: Tue, 6 Aug 2024 16:25:34 -0400
Subject: [PATCH 3/4] update styles, remove orange ring

---
 src/js/components/CollectionsToolbar/index.svelte | 6 ------
 src/scss/apps.scss                                | 3 +++
 src/scss/styles.scss                              | 8 ++++++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/js/components/CollectionsToolbar/index.svelte b/src/js/components/CollectionsToolbar/index.svelte
index 0b4602e..0fa22b4 100644
--- a/src/js/components/CollectionsToolbar/index.svelte
+++ b/src/js/components/CollectionsToolbar/index.svelte
@@ -347,10 +347,4 @@
 <CollectionEditModal bind:this={modal} {userIsAnonymous} {c} {cn} {desc} {contributorName} {shared} {submitAction} />
 
 <style>
-  .bg-secondary button:not(.dropdown-item):focus-visible, .bg-secondary .form-select:focus-visible {
-    outline-offset:0;
-  }
-  .form-select:focus {
-    border-color: transparent;
-  }
 </style>
diff --git a/src/scss/apps.scss b/src/scss/apps.scss
index 49aa9b4..b813330 100644
--- a/src/scss/apps.scss
+++ b/src/scss/apps.scss
@@ -312,6 +312,9 @@ body {
       border-bottom-right-radius: 0.375rem;
     }
   }
+  #toolbar-seq.form-control:focus {
+    border-color: #fff;
+  }
 }
 
 span.query-term {
diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index 809278a..3566d52 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -368,6 +368,14 @@ a:focus-visible {
   border-radius: 6px;
 }
 
+.bg-secondary button:not(.dropdown-item):focus-visible, .bg-secondary .form-select:focus-visible, .bg-dark .form-control:focus-visible {
+  outline-offset:0;
+}
+.form-select:focus, .form-control:focus {
+  border-color: transparent;
+}
+
+
 .form-check-input, .form-control, .form-select {
   border: 1px solid var(--color-neutral-500);
 }

From 96480a673063a5056e29e2ffb205d9edf7f4d8bc Mon Sep 17 00:00:00 2001
From: Caryl Wyatt <carylw@hathitrust.org>
Date: Wed, 7 Aug 2024 14:10:41 -0400
Subject: [PATCH 4/4] fix focus border color

---
 src/scss/styles.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index 3566d52..2656977 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -371,13 +371,12 @@ a:focus-visible {
 .bg-secondary button:not(.dropdown-item):focus-visible, .bg-secondary .form-select:focus-visible, .bg-dark .form-control:focus-visible {
   outline-offset:0;
 }
-.form-select:focus, .form-control:focus {
-  border-color: transparent;
-}
 
 
 .form-check-input, .form-control, .form-select {
+  &:focus {
   border: 1px solid var(--color-neutral-500);
+  }
 }
 input.form-control[type],
 textarea.form-control {