Merge branch 'jules-HC-avatar-and-diffstat-borders' of https://github…

….com/primer/primitives into jules-HC-avatar-and-diffstat-borders
primer · Jun 22, 2021 · a4aff36 · a4aff36
2 parents c9f226a + e91091f
commit a4aff36
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 31 deletions.
diff --git a/.changeset/fuzzy-mangos-bake.md b/.changeset/fuzzy-mangos-bake.md
diff --git a/.changeset/poor-chicken-yell.md → .changeset/lucky-baboons-walk.md b/.changeset/poor-chicken-yell.md → .changeset/lucky-baboons-walk.md
@@ -2,4 +2,4 @@
 "@primer/primitives": patch
 ---
 
-Primary button fixes
+Deprecate globalNav
diff --git a/.changeset/new-cherries-smoke.md → .changeset/six-singers-do.md b/.changeset/new-cherries-smoke.md → .changeset/six-singers-do.md
@@ -2,4 +2,4 @@
 "@primer/primitives": patch
 ---
 
-Global Nav → input fixes
+neutral.emphasis fix in HC
diff --git a/.changeset/yellow-drinks-begin.md → .changeset/unlucky-news-breathe.md b/.changeset/yellow-drinks-begin.md → .changeset/unlucky-news-breathe.md
@@ -2,4 +2,4 @@
 "@primer/primitives": patch
 ---
 
-Update neutral emphasis
+header-input border fix
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @primer/primitives
 
+## 4.4.2
+
+### Patch Changes
+
+- [#151](https://github.com/primer/primitives/pull/151) [`73a53a0`](https://github.com/primer/primitives/commit/73a53a0094074791eb8c6cebb1320db017f8719b) Thanks [@Juliusschaeper](https://github.com/Juliusschaeper)! - Fixed states for btn.danger in HC
+
+* [#149](https://github.com/primer/primitives/pull/149) [`9539f54`](https://github.com/primer/primitives/commit/9539f54666dfb4e45b5d00a3ebd4d633f578f1de) Thanks [@Juliusschaeper](https://github.com/Juliusschaeper)! - Global Nav → input fixes
+
+- [#145](https://github.com/primer/primitives/pull/145) [`c6fd869`](https://github.com/primer/primitives/commit/c6fd86990b97abae9821ee5eb858ab83ae783163) Thanks [@Juliusschaeper](https://github.com/Juliusschaeper)! - Primary button fixes
+
+* [#152](https://github.com/primer/primitives/pull/152) [`281a7fb`](https://github.com/primer/primitives/commit/281a7fbba59d3afecac3f6761346093ca6470830) Thanks [@Juliusschaeper](https://github.com/Juliusschaeper)! - Update neutral emphasis
+
 ## 4.4.1
 
 ### Patch Changes

diff --git a/data/colors_v2/vars/deprecated.ts b/data/colors_v2/vars/deprecated.ts
@@ -579,6 +579,16 @@ export default {
       gradientBg: unset
     }
   },
+  globalNav: {
+    logo: deprecated,
+    bg: deprecated,
+    text: deprecated,
+    icon: deprecated,
+    inputBg: deprecated,
+    inputBorder: deprecated,
+    inputIcon: deprecated,
+    inputPlaceholder: deprecated,
+  },
   introShelf: {
     gradientLeft: get('accent.subtle'),
     gradientRight: get('success.subtle'),

diff --git a/data/colors_v2/vars/product_dark.ts b/data/colors_v2/vars/product_dark.ts
@@ -10,16 +10,6 @@ export default {
   diffBlob: {
     selectedLineHighlightMixBlendMode: 'multiply'
   },
-  globalNav: {
-    logo: get('scale.gray.0'),
-    bg: get('scale.gray.8'),
-    text: get('scale.gray.1'),
-    icon: get('scale.gray.1'),
-    inputBg: get('scale.gray.9'),
-    inputBorder: get('border.default'),
-    inputIcon: get('fg.subtle'),
-    inputPlaceholder: get('fg.subtle')
-  },
   prettylights: {
     syntax: {
       comment: get('scale.gray.3'),
@@ -158,6 +148,6 @@ export default {
   },
   headerSearch: {
     bg: get('scale.gray.9'),
-    border: get('scale.gray.7')
+    border: get('scale.gray.6')
   }
 }
diff --git a/data/colors_v2/vars/product_light.ts b/data/colors_v2/vars/product_light.ts
@@ -10,16 +10,6 @@ export default {
   diffBlob: {
     selectedLineHighlightMixBlendMode: 'multiply'
   },
-  globalNav: {
-    logo: get('scale.white'),
-    bg: get('scale.gray.9'),
-    text: get('scale.white'),
-    icon: get('scale.white'),
-    inputBg: get('scale.gray.0'),
-    inputBorder: get('scale.gray.0'),
-    inputIcon: get('scale.gray.3'),
-    inputPlaceholder: get('scale.gray.4')
-  },
   prettylights: {
     syntax: {
       comment: get('scale.gray.5'),
@@ -158,6 +148,6 @@ export default {
   },
   headerSearch: {
     bg: get('scale.gray.9'),
-    border: get('scale.gray.7')
+    border: get('scale.gray.6')
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/primitives",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "Typography, spacing, and color primitives for Primer design system",
   "files": ["dist"],
   "main": "dist/js/index.js",