From 82c2775cf68cb487a1eca93a74c76959863db8df Mon Sep 17 00:00:00 2001
From: langermank <18661030+langermank@users.noreply.github.com>
Date: Wed, 19 Jun 2024 16:04:58 -0700
Subject: [PATCH 1/2] use control borders

---
 src/buttons/button.scss    | 4 ++--
 src/navigation/subnav.scss | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/buttons/button.scss b/src/buttons/button.scss
index b597521052..bf3995ade5 100644
--- a/src/buttons/button.scss
+++ b/src/buttons/button.scss
@@ -93,8 +93,8 @@
   &.disabled,
   &[aria-disabled='true'] {
     color: var(--fgColor-disabled, var(--color-primer-fg-disabled));
-    background-color: var(--button-default-bgColor-rest, var(--color-btn-bg));
-    border-color: var(--button-default-borderColor-rest, var(--color-btn-border));
+    background-color: var(--button-default-bgColor-disabled, var(--color-btn-bg));
+    border-color: var(--button-default-borderColor-disabled, var(--color-btn-border));
 
     .octicon {
       color: var(--fgColor-disabled, var(--color-primer-fg-disabled));
diff --git a/src/navigation/subnav.scss b/src/navigation/subnav.scss
index eca46552b8..acfe1639c9 100644
--- a/src/navigation/subnav.scss
+++ b/src/navigation/subnav.scss
@@ -28,7 +28,7 @@
   // stylelint-disable-next-line primer/typography
   line-height: 20px;
   color: var(--fgColor-default, var(--color-fg-default));
-  border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
+  border: $border-width $border-style var(--control-borderColor-rest, var(--color-border-default));
 
   + .subnav-item {
     // stylelint-disable-next-line primer/spacing

From d9294931f03fd1550a97f6fac547c017463e51e2 Mon Sep 17 00:00:00 2001
From: Katie Langerman <18661030+langermank@users.noreply.github.com>
Date: Thu, 20 Jun 2024 07:19:14 -0700
Subject: [PATCH 2/2] Create red-flowers-own.md

---
 .changeset/red-flowers-own.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/red-flowers-own.md

diff --git a/.changeset/red-flowers-own.md b/.changeset/red-flowers-own.md
new file mode 100644
index 0000000000..45c0f5ab69
--- /dev/null
+++ b/.changeset/red-flowers-own.md
@@ -0,0 +1,5 @@
+---
+"@primer/css": patch
+---
+
+Use `control` borders for subnav + disabled button fix