Merge branch 'main' into remove-old-colors

.changeset/lazy-moose-agree.md

@@ -0,0 +1,5 @@
+---
+'@primer/css': patch
+---
+
+Fix 'clac' -> 'calc' typo

CHANGELOG.md

@@ -1,5 +1,13 @@
 # @primer/css
 
+## 21.3.2
+
+### Patch Changes
+
+- [#2643](https://github.com/primer/css/pull/2643) [`ab6076c`](https://github.com/primer/css/commit/ab6076c62bac967d5d0c805744e50cc8d73d4171) Thanks [@langermank](https://github.com/langermank)! - Use `control` borders for subnav + disabled button fix
+
+- [#2634](https://github.com/primer/css/pull/2634) [`af3ab76`](https://github.com/primer/css/commit/af3ab76454fd3045315082a14cdc5bdfcabd860a) Thanks [@jonrohan](https://github.com/jonrohan)! - Upgrade to @primer/primtives@8.2.0 and @primer/stylelint-config@13.0.0-rc
+
 ## 21.3.1
 
 ### Patch Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/css",
-  "version": "21.3.1",
+  "version": "21.3.2",
   "description": "The CSS implementation of GitHub's Primer Design System",
   "homepage": "https://primer.style/css",
   "author": "GitHub, Inc.",

src/buttons/button.scss

@@ -93,8 +93,8 @@
   &.disabled,
   &[aria-disabled='true'] {
     color: var(--fgColor-disabled);
-    background-color: var(--button-default-bgColor-rest);
-    border-color: var(--button-default-borderColor-rest);
+    background-color: var(--button-default-bgColor-disabled);
+    border-color: var(--button-default-borderColor-disabled);
 
     .octicon {
       color: var(--fgColor-disabled);

src/forms/radio-group.scss

@@ -7,7 +7,7 @@
 .radio-label {
   float: left;
   // stylelint-disable-next-line primer/spacing
-  padding: 6px var(--base-size-16) 6px clac(var(--base-size-16) + 12px + var(--base-size-8)); // 12px is the size of the radio-input
+  padding: 6px var(--base-size-16) 6px calc(var(--base-size-16) + 12px + var(--base-size-8)); // 12px is the size of the radio-input
   // stylelint-disable-next-line primer/spacing
   margin-left: -1px;
   font-size: $body-font-size;

src/navigation/subnav.scss

@@ -28,7 +28,7 @@
   // stylelint-disable-next-line primer/typography
   line-height: 20px;
   color: var(--fgColor-default);
-  border: $border-width $border-style var(--borderColor-default);
+  border: $border-width $border-style var(--control-borderColor-rest);
 
   + .subnav-item {
     // stylelint-disable-next-line primer/spacing