From b5c4c3f8920072d9ba869df4b8775f55a781fa1a Mon Sep 17 00:00:00 2001
From: langermank <langermank@github.com>
Date: Tue, 26 Apr 2022 17:39:39 -0700
Subject: [PATCH 1/4] extra CSS found from cleaning up feat flag

---
 src/autocomplete/autocomplete.scss |  4 ++++
 src/forms/form-validation.scss     | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/autocomplete/autocomplete.scss b/src/autocomplete/autocomplete.scss
index f0bf279e25..93221b8f50 100644
--- a/src/autocomplete/autocomplete.scss
+++ b/src/autocomplete/autocomplete.scss
@@ -46,6 +46,10 @@
     &:focus {
       box-shadow: none;
     }
+
+    &:focus-visible {
+      box-shadow: none;
+    }
   }
 }
 
diff --git a/src/forms/form-validation.scss b/src/forms/form-validation.scss
index bb96b73a1f..cf2a8c0723 100644
--- a/src/forms/form-validation.scss
+++ b/src/forms/form-validation.scss
@@ -235,15 +235,16 @@ dl.form-group > dd, // TODO: Deprecate
   }
 
   &.focused {
-    border-radius: $border-radius;
-    box-shadow: var(--color-primer-shadow-inset), var(--color-primer-shadow-focus);
+    @include focusBoxShadow(2px, var(--color-accent-fg));
 
     .form-control {
+      border-color: transparent;
+      border-bottom-color: var(--color-accent-fg);
       box-shadow: none;
     }
 
     .drag-and-drop {
-      border-color: var(--color-accent-emphasis);
+      border-color: transparent;
     }
   }
 }
@@ -272,7 +273,9 @@ dl.form-group > dd, // TODO: Deprecate
     border: $border-width $border-style var(--color-border-default);
   }
 
-  .comment-form-error { margin-bottom: $spacer-2; }
+  .comment-form-error {
+    margin-bottom: $spacer-2;
+  }
 
   .write-content,
   .preview-content {
@@ -318,7 +321,9 @@ div.composer {
 }
 
 // stylelint-disable-next-line primer/spacing
-.composer .tabnav { margin: 0 0 10px; }
+.composer .tabnav {
+  margin: 0 0 10px;
+}
 
 // Misc CSS
 //

From 14e298ebf69e3a43f02d621ce0dcb9196838aeb9 Mon Sep 17 00:00:00 2001
From: langermank <langermank@github.com>
Date: Tue, 26 Apr 2022 18:01:16 -0700
Subject: [PATCH 2/4] lint

---
 src/forms/form-validation.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forms/form-validation.scss b/src/forms/form-validation.scss
index cf2a8c0723..75b4f14f93 100644
--- a/src/forms/form-validation.scss
+++ b/src/forms/form-validation.scss
@@ -320,8 +320,8 @@ div.composer {
   min-height: 200px;
 }
 
-// stylelint-disable-next-line primer/spacing
 .composer .tabnav {
+  // stylelint-disable-next-line primer/spacing
   margin: 0 0 10px;
 }
 

From a6bc020a6bf01ee0534a047f1add448c9475ed30 Mon Sep 17 00:00:00 2001
From: Katie Langerman <langermank@github.com>
Date: Tue, 26 Apr 2022 18:11:18 -0700
Subject: [PATCH 3/4] Create young-trainers-yell.md

---
 .changeset/young-trainers-yell.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/young-trainers-yell.md

diff --git a/.changeset/young-trainers-yell.md b/.changeset/young-trainers-yell.md
new file mode 100644
index 0000000000..af3ec5cbac
--- /dev/null
+++ b/.changeset/young-trainers-yell.md
@@ -0,0 +1,5 @@
+---
+"@primer/css": major
+---
+
+Global focus style CSS from feature flag (next major)

From 5d16f8aa370b3b53ca2299410ac35b3da36cfc5c Mon Sep 17 00:00:00 2001
From: langermank <langermank@github.com>
Date: Wed, 27 Apr 2022 08:36:20 -0700
Subject: [PATCH 4/4] fix mixin

---
 src/forms/form-validation.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forms/form-validation.scss b/src/forms/form-validation.scss
index 75b4f14f93..018a781e06 100644
--- a/src/forms/form-validation.scss
+++ b/src/forms/form-validation.scss
@@ -235,7 +235,7 @@ dl.form-group > dd, // TODO: Deprecate
   }
 
   &.focused {
-    @include focusBoxShadow(2px, var(--color-accent-fg));
+    @include focusBoxShadowInset(2px, var(--color-accent-fg));
 
     .form-control {
       border-color: transparent;