Skip to content

Commit 8123aee

Browse files
jonrohancamertron
andauthored
Remove old primitives color themes imports and only use V8 (primer#2731)
Co-authored-by: jonrohan <jonrohan@users.noreply.github.com> Co-authored-by: Cameron Dutro <camertron@gmail.com>
1 parent 2b0a7bf commit 8123aee

File tree

21 files changed

+63
-22
lines changed

21 files changed

+63
-22
lines changed

.changeset/flat-bags-remain.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/view-components": patch
3+
---
4+
5+
Remove old primitives color themes imports and only use V8 on the demo lookbook

demo/app/assets/stylesheets/application.css

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,64 @@
1010
*= require @primer/primitives/tokens-next-private/css/functional/size/size.css
1111
*= require @primer/primitives/tokens-next-private/css/functional/size/viewport.css
1212
*= require @primer/primitives/tokens-next-private/css/functional/typography/typography.css
13-
*= require @primer/css/dist/color-modes.css
13+
*= require @primer/primitives/tokens-next-private/css/functional/themes/dark-colorblind.css
14+
*= require @primer/primitives/tokens-next-private/css/functional/themes/dark-dimmed.css
15+
*= require @primer/primitives/tokens-next-private/css/functional/themes/dark-high-contrast.css
16+
*= require @primer/primitives/tokens-next-private/css/functional/themes/dark-tritanopia.css
17+
*= require @primer/primitives/tokens-next-private/css/functional/themes/dark.css
18+
*= require @primer/primitives/tokens-next-private/css/functional/themes/light-colorblind.css
19+
*= require @primer/primitives/tokens-next-private/css/functional/themes/light-high-contrast.css
20+
*= require @primer/primitives/tokens-next-private/css/functional/themes/light-tritanopia.css
21+
*= require @primer/primitives/tokens-next-private/css/functional/themes/light.css
1422
*= require @primer/css/dist/base.css
1523
*= require @primer/css/dist/buttons.css
1624
*= require @primer/css/dist/layout.css
1725
*= require @primer/css/dist/utilities.css
1826
*= require @primer/css/dist/markdown.css
1927
*/
28+
29+
:root,[data-color-mode="light"][data-light-theme*="light"],[data-color-mode="dark"][data-dark-theme*="light"] {
30+
color-scheme: light
31+
}
32+
33+
@media(prefers-color-scheme: light) {
34+
[data-color-mode="auto"][data-light-theme*="light"] {
35+
color-scheme:light
36+
}
37+
}
38+
39+
@media(prefers-color-scheme: dark) {
40+
[data-color-mode="auto"][data-dark-theme*="light"] {
41+
color-scheme:light
42+
}
43+
}
44+
45+
[data-color-mode="light"][data-light-theme*="dark"],[data-color-mode="dark"][data-dark-theme*="dark"] {
46+
color-scheme: dark
47+
}
48+
49+
@media(prefers-color-scheme: light) {
50+
[data-color-mode="auto"][data-light-theme*="dark"] {
51+
color-scheme:dark
52+
}
53+
}
54+
55+
@media(prefers-color-scheme: dark) {
56+
[data-color-mode="auto"][data-dark-theme*="dark"] {
57+
color-scheme:dark
58+
}
59+
}
60+
61+
[data-color-mode] {
62+
color: var(--fgColor-default, var(--color-fg-default));
63+
background-color: var(--bgColor-default, var(--color-canvas-default))
64+
}
65+
66+
@media(forced-colors: active) {
67+
body {
68+
--color-accent-emphasis: Highlight;
69+
--color-fg-on-emphasis: LinkText;
70+
--fgColor-onEmphasis: LinkText;
71+
--fgColor-accent: Highlight
72+
}
73+
}

demo/app/assets/stylesheets/component_preview.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
position: absolute;
3333
bottom: 0;
3434
right: 0;
35-
background-color: var(--color-canvas-subtle);
35+
background-color: var(--bgColor-muted);
3636
padding: var(--base-size-4) var(--base-size-8);
3737
font: var(--primer-text-caption-shorthand);
3838
}

demo/app/assets/stylesheets/primitives_v8.css

Lines changed: 0 additions & 11 deletions
This file was deleted.

demo/app/views/layouts/component_preview.html.erb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<%= csrf_meta_tags %>
77
<%= csp_meta_tag %>
88
<%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
9-
<% if params.dig(:primitives) || params.dig(:lookbook, :display, :primitives) == "next_major_v8" %>
10-
<%= stylesheet_link_tag "primitives_v8", "data-turbo-track": "reload" %>
11-
<% end %>
129
<%= stylesheet_link_tag "primer_view_components", "data-turbo-track": "reload" %>
1310
<%= javascript_include_tag "primer_view_components", type: "module", "data-turbo-track": "reload" %>
1411
<% if Rails.env.development? %>

demo/config/application.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ class Application < Rails::Application
9090
["Dark high contrast", "dark_high_contrast"],
9191
["Dark colorblind", "dark_colorblind"],
9292
["All themes", "all"]
93-
],
94-
primitives: [
95-
["Next Major v8", "next_major_v8"],
96-
["Default", "default"]
9793
]
9894
}
9995

test/playwright/snapshots.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ test.describe('generate snapshots', () => {
3232
if (example.snapshot === 'interactive') {
3333
for (const theme of themes) {
3434
test(`${example.preview_path}-${theme}`, async ({page}) => {
35-
await page.goto(`/rails/view_components/${example.preview_path}?theme=${theme}&primitives=next_major_v8`)
35+
await page.goto(`/rails/view_components/${example.preview_path}?theme=${theme}`)
3636

3737
// Focus state
3838
await page.keyboard.press('Tab')
@@ -50,7 +50,7 @@ test.describe('generate snapshots', () => {
5050
}
5151

5252
test(example.preview_path, async ({page}) => {
53-
await page.goto(`/rails/view_components/${example.preview_path}?theme=all&primitives=next_major_v8`)
53+
await page.goto(`/rails/view_components/${example.preview_path}?theme=all`)
5454
const defaultScreenshot = await page.locator('#component-preview').screenshot({animations: 'disabled'})
5555
expect(defaultScreenshot).toMatchSnapshot([example.preview_path, 'default.png'])
5656

0 commit comments

Comments
 (0)