Skip to content

Commit

Permalink
Fix for primary color in cvd modes (#555)
Browse files Browse the repository at this point in the history
* fix for primary color in cvd modes

* fix for danger.fg

* fix for accent in dark mode

* bugfix

* Create .changeset/polite-penguins-wonder.md

---------

Co-authored-by: simurai <simurai@github.com>
  • Loading branch information
lukasoppermann and simurai authored Apr 5, 2023
1 parent 1ddcbe7 commit 98ca36a
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .changeset/polite-penguins-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/primitives": patch
---

Fix for primary color in cvd modes
2 changes: 1 addition & 1 deletion data/colors/themes/dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import darkMarketingVars from '../vars/marketing_dark'
import darkAppVars from '../vars/app_dark'

const scale = {
black: '#F10409',
black: '#010409',
white: '#ffffff',
gray: ['#f0f6fc', '#c9d1d9', '#b1bac4', '#8b949e', '#6e7681', '#484f58', '#30363d', '#21262d', '#161b22', '#0d1117'],
blue: ['#cae8ff', '#a5d6ff', '#79c0ff', '#58a6ff', '#388bfd', '#1f6feb', '#1158c7', '#0d419d', '#0c2d6b', '#051d4d'],
Expand Down
3 changes: 3 additions & 0 deletions data/colors/themes/dark_colorblind.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ const scale = {
}

const exceptions = {
accent: {
fg: get('scale.blue.3'),
},
open: {
fg: get('scale.orange.3'),
emphasis: get('scale.orange.5'),
Expand Down
3 changes: 3 additions & 0 deletions data/colors/themes/dark_dimmed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ const scale = {
}

const exceptions = {
accent: {
fg: get('scale.blue.3'),
},
diffBlob: {
expander: {
icon: get('fg.default'),
Expand Down
3 changes: 2 additions & 1 deletion data/colors/themes/dark_high_contrast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ const exceptions = {
emphasisPlus: get('scale.gray.0')
},
accent: {
muted: get('scale.blue.4'),
fg: get('scale.blue.3'),
muted: get('scale.blue.4')
},
success: {
muted: get('scale.green.4'),
Expand Down
10 changes: 8 additions & 2 deletions data/colors/themes/dark_tritanopia.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {merge} from '../../../src/utils-v1'
import {get, merge} from '../../../src/utils-v1'
import dark_colorblind from './dark_colorblind'

const scale = {
Expand Down Expand Up @@ -59,4 +59,10 @@ const scale = {
coral: ['#ffddd2', '#ffc2b2', '#ffa28b', '#f78166', '#ea6045', '#cf462d', '#ac3220', '#872012', '#640d04', '#460701']
}

export default merge(dark_colorblind, {scale})
const exceptions = {
accent: {
fg: get('scale.blue.3'),
},
}

export default merge(dark_colorblind, exceptions, {scale})
6 changes: 6 additions & 0 deletions data/colors/themes/light_colorblind.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ const scale = {
}

const exceptions = {
success: {
emphasis: get('scale.green.5'),
},
open: {
fg: get('scale.orange.5'),
emphasis: get('scale.orange.4'),
Expand All @@ -72,6 +75,9 @@ const exceptions = {
muted: alpha(get('scale.gray.3'), 0.4),
subtle: get('scale.gray.0')
},
danger: {
fg: get('scale.red.5'),
},
diffBlob: {
addition: {
numBg: get('success.muted'),
Expand Down
13 changes: 11 additions & 2 deletions data/colors/themes/light_tritanopia.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {merge} from '../../../src/utils-v1'
import {merge, get} from '../../../src/utils-v1'
import light_colorblind from './light_colorblind'

const scale = {
Expand Down Expand Up @@ -59,4 +59,13 @@ const scale = {
coral: ['#fff0eb', '#ffd6cc', '#ffb4a1', '#fd8c73', '#ec6547', '#c4432b', '#9e2f1c', '#801f0f', '#691105', '#510901']
}

export default merge(light_colorblind, {scale})
const exceptions = {
success: {
emphasis: get('scale.green.5'),
},
danger: {
fg: get('scale.red.5'),
}
}

export default merge(light_colorblind, exceptions, {scale})

0 comments on commit 98ca36a

Please sign in to comment.