Add Primitives v8 colors #529
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@primer/primitives": patch | ||
| --- | ||
|
|
||
| Add Primitives v8 colors (private dist for testing) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,10 +7,10 @@ const getCssSelectors = (outputFile: string): {selector: string; selectorLight: | |
| const lastSlash = outputFile.lastIndexOf('/') | ||
| const outputBasename = outputFile.substring(lastSlash + 1, outputFile.indexOf('.')) | ||
| const themeName = outputBasename.replace(/-/g, '_') | ||
| // const mode = outputBasename.substring(0, 4) === 'dark' ? 'dark' : 'light' | ||
|
|
||
| return { | ||
| selector: `[data-color-mode="light"][data-light-theme="${themeName}"], [data-color-mode="dark"][data-dark-theme="${themeName}"]`, | ||
|
There was a problem hiding this comment. Why are you changing this? There was a problem hiding this comment. I was working on updating the theme picker in Storybook last week with @colebemis and we found a bug with the selector stack. I think the theme picker was written in such a way that the theme would never fail to match the selector, and Cole suggested this change to make it match the logic in dotcom. What do you think? There was a problem hiding this comment. If this is really the case, I will do a PR just for this, so that it is not hidden in this giant one and can be more easily tracked. However I am not sure this is actually correct. Maybe @colebemis can add to this discussion. [data-color-mode="light"][data-light-theme="light_colorblind"],
[data-color-mode="auto"][data-light-theme="light_colorblind"] {
or
[data-color-mode="dark"][data-dark-theme="dark_high_contrast"],
[data-color-mode="auto"][data-light-theme="dark_high_contrast"] {With the proposed changes we get: [data-color-mode="light"][data-light-theme="light_colorblind"],
[data-color-mode="dark"][data-dark-theme="light_colorblind"],
[data-color-mode="auto"][data-light-theme="light_colorblind"] {
or
[data-color-mode="light"][data-light-theme="dark_high_contrast"],
[data-color-mode="dark"][data-dark-theme="dark_high_contrast"],
[data-color-mode="auto"][data-light-theme="dark_high_contrast"] {What is added is a line I think will never execute. As far as I see you can't get a combination of Am I missing something? There was a problem hiding this comment.
Yeah that's correct, in dotcom ui, when selecting single mode, you'll only get the corresponding There was a problem hiding this comment. Removing this change for now, and we can bring it back later if we find it necessary in dotcom! There was a problem hiding this comment. Ah, you're right. I got confused because that combination is technically possible in code. I didn't realize dotcom prevents that from happening |
||
| selectorLight: `[data-color-mode="auto"][data-light-theme="${themeName}"]`, | ||
| selectorDark: `[data-color-mode="auto"][data-dark-theme="${themeName}"]`, | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| base: { | ||
| color: { | ||
| black: { | ||
| $value: '#1f2328', | ||
| $type: 'color', | ||
| }, | ||
| transparent: { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| outline: { | ||
| focus: { | ||
| $value: { | ||
| color: '{focus.outlineColor}', | ||
| style: 'solid', | ||
| width: '1px', | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| { | ||
| focus: { | ||
| outline: { | ||
| $value: { | ||
| color: '{focus.outlineColor}', | ||
| style: 'solid', | ||
| width: '1px', | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,242 @@ | ||
| { | ||
| topicTag: { | ||
| borderColor: { | ||
| $value: '{base.color.transparent}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| highlight: { | ||
| neutral: { | ||
| bgColor: { | ||
| $value: '{base.color.yellow.3}', | ||
| $type: 'color', | ||
| alpha: 0.4, | ||
| }, | ||
| }, | ||
| }, | ||
| page: { | ||
| header: { | ||
| bgColor: { | ||
| $value: '{bgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| }, | ||
| diffBlob: { | ||
| addition: { | ||
| fgColor: { | ||
| text: { | ||
| $value: '{fgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| num: { | ||
| $value: '{fgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| bgColor: { | ||
| num: { | ||
| $value: '{base.color.green.3}', | ||
| $type: 'color', | ||
| alpha: 0.3, | ||
| }, | ||
| line: { | ||
| $value: '{base.color.green.4}', | ||
| $type: 'color', | ||
| alpha: 0.15, | ||
| mix: null, | ||
| }, | ||
| word: { | ||
| $value: '{base.color.green.4}', | ||
| $type: 'color', | ||
| alpha: 0.4, | ||
| }, | ||
| }, | ||
| }, | ||
| deletion: { | ||
| fgColor: { | ||
| text: { | ||
| $value: '{fgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| num: { | ||
| $value: '{fgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| bgColor: { | ||
| num: { | ||
| $value: '{base.color.red.4}', | ||
| $type: 'color', | ||
| alpha: 0.3, | ||
| }, | ||
| line: { | ||
| $value: '{base.color.red.4}', | ||
| $type: 'color', | ||
| alpha: 0.15, | ||
| mix: null, | ||
| }, | ||
| word: { | ||
| $value: '{base.color.red.4}', | ||
| $type: 'color', | ||
| alpha: 0.4, | ||
| }, | ||
| }, | ||
| }, | ||
| hunk: { | ||
| bgColor: { | ||
| num: { | ||
| $value: '{borderColor.accent.muted}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| }, | ||
| expander: { | ||
| iconColor: { | ||
| $value: '{fgColor.muted}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| }, | ||
| diffStat: { | ||
| addition: { | ||
| bgColor: { | ||
| $value: '{bgColor.success.emphasis}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| }, | ||
| codeMirror: { | ||
| fgColor: { | ||
| $value: '{fgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| bgColor: { | ||
| $value: '{bgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| gutters: { | ||
| bgColor: { | ||
| $value: '{bgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| gutterMarker: { | ||
| fgColor: { | ||
| default: { | ||
| $value: '{bgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| muted: { | ||
| $value: '{fgColor.muted}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| }, | ||
| lineNumber: { | ||
| fgColor: { | ||
| $value: '{fgColor.muted}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| cursor: { | ||
| fgColor: { | ||
| $value: '{fgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| selection: { | ||
| bgColor: { | ||
| $value: '{borderColor.accent.muted}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| activeline: { | ||
| bgColor: { | ||
| $value: '{bgColor.neutral.muted}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| matchingBracket: { | ||
| fgColor: { | ||
| $value: '{fgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| lines: { | ||
| bgColor: { | ||
| $value: '{bgColor.default}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| syntax: { | ||
| fgColor: { | ||
| comment: { | ||
| $value: '{base.color.gray.3}', | ||
| $type: 'color', | ||
| }, | ||
| constant: { | ||
| $value: '{base.color.blue.2}', | ||
| $type: 'color', | ||
| }, | ||
| entity: { | ||
| $value: '{base.color.purple.2}', | ||
| $type: 'color', | ||
| }, | ||
| keyword: { | ||
| $value: '{base.color.red.3}', | ||
| $type: 'color', | ||
| }, | ||
| storage: { | ||
| $value: '{base.color.red.3}', | ||
| $type: 'color', | ||
| }, | ||
| string: { | ||
| $value: '{base.color.blue.1}', | ||
| $type: 'color', | ||
| }, | ||
| support: { | ||
| $value: '{base.color.blue.2}', | ||
| $type: 'color', | ||
| }, | ||
| variable: { | ||
| $value: '{base.color.orange.2}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| header: { | ||
| fgColor: { | ||
| default: { | ||
| $value: '{fgColor.onEmphasis}', | ||
| $type: 'color', | ||
| alpha: 0.7, | ||
| }, | ||
| logo: { | ||
| $value: '{fgColor.onEmphasis}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| bgColor: { | ||
| $value: '{base.color.gray.9}', | ||
| $type: 'color', | ||
| }, | ||
| borderColor: { | ||
| divider: { | ||
| $value: '{base.color.gray.3}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| }, | ||
| headerSearch: { | ||
| bgColor: { | ||
| $value: '{base.color.gray.9}', | ||
| $type: 'color', | ||
| }, | ||
| borderColor: { | ||
| $value: '{base.color.gray.6}', | ||
| $type: 'color', | ||
| }, | ||
| }, | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have another name for this effort? It would be v3 of renaming efforts, although it doesn't match Primitives's current semver version. 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm trying to refer to this as the next major (v8) release of Primitives vs. v3, which I think sounds a little nicer and more accurate! In v8 we will also ship all the sizing tokens without fallbacks, so it truly feels like a big major release.