Skip to content

Commit 0263948

Browse files
Move diffBlob into file light mode (#1133)
* light mode * trying to fix * fix * fix * f * fix
1 parent a4c4008 commit 0263948

File tree

3 files changed

+271
-269
lines changed

3 files changed

+271
-269
lines changed

scripts/themes.config.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ export const themes: TokenBuildInput[] = [
2020
filename: 'light-tritanopia',
2121
theme: 'light-tritanopia',
2222
source: [
23-
`src/tokens/functional/color/light/*.json5`,
2423
`src/tokens/functional/shadow/light.json5`,
2524
`src/tokens/functional/border/*.json5`,
2625
`src/tokens/component/*.json5`,
26+
`src/tokens/functional/color/light/*.json5`,
2727
`src/tokens/functional/color/light/overrides/light.tritanopia.json5`,
2828
],
2929
include: [
@@ -36,10 +36,10 @@ export const themes: TokenBuildInput[] = [
3636
filename: 'light-colorblind',
3737
theme: 'light-protanopia-deuteranopia',
3838
source: [
39-
`src/tokens/functional/color/light/*.json5`,
4039
`src/tokens/functional/shadow/light.json5`,
4140
`src/tokens/functional/border/*.json5`,
4241
`src/tokens/component/*.json5`,
42+
`src/tokens/functional/color/light/*.json5`,
4343
`src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5`,
4444
],
4545
include: [
@@ -52,10 +52,10 @@ export const themes: TokenBuildInput[] = [
5252
filename: 'light-high-contrast',
5353
theme: 'light-high-contrast',
5454
source: [
55-
`src/tokens/functional/color/light/*.json5`,
5655
`src/tokens/functional/shadow/light.json5`,
5756
`src/tokens/functional/border/*.json5`,
5857
`src/tokens/component/*.json5`,
58+
`src/tokens/functional/color/light/*.json5`,
5959
`src/tokens/functional/color/light/overrides/light.high-contrast.json5`,
6060
],
6161
include: [
@@ -69,10 +69,10 @@ export const themes: TokenBuildInput[] = [
6969
filename: 'dark',
7070
theme: 'dark',
7171
source: [
72-
`src/tokens/functional/color/dark/*.json5`,
7372
`src/tokens/functional/shadow/dark.json5`,
7473
`src/tokens/functional/border/*.json5`,
7574
`src/tokens/component/*.json5`,
75+
`src/tokens/functional/color/dark/*.json5`,
7676
],
7777
include: [
7878
`src/tokens/functional/size/border.json5`,
@@ -84,28 +84,27 @@ export const themes: TokenBuildInput[] = [
8484
filename: 'dark-dimmed',
8585
theme: 'dark-dimmed',
8686
source: [
87-
`src/tokens/functional/color/dark/*.json5`,
88-
`src/tokens/functional/color/dark/overrides/dark.dimmed.json5`,
8987
`src/tokens/functional/shadow/dark.json5`,
9088
`src/tokens/functional/border/*.json5`,
9189
`src/tokens/component/*.json5`,
90+
`src/tokens/functional/color/dark/*.json5`,
91+
`src/tokens/functional/color/dark/overrides/dark.dimmed.json5`,
9292
],
9393
include: [
9494
`src/tokens/functional/size/border.json5`,
9595
`src/tokens/base/color/dark/dark.json5`,
9696
`src/tokens/base/color/dark/dark.dimmed.json5`,
9797
`src/tokens/base/color/dark/display-dark.json5`,
98-
`src/tokens/component/*.json5`,
9998
],
10099
},
101100
{
102101
filename: 'dark-tritanopia',
103102
theme: 'dark-tritanopia',
104103
source: [
105-
`src/tokens/functional/color/dark/*.json5`,
106104
`src/tokens/functional/shadow/dark.json5`,
107105
`src/tokens/functional/border/*.json5`,
108106
`src/tokens/component/*.json5`,
107+
`src/tokens/functional/color/dark/*.json5`,
109108
`src/tokens/functional/color/dark/overrides/dark.tritanopia.json5`,
110109
],
111110
include: [
@@ -118,10 +117,10 @@ export const themes: TokenBuildInput[] = [
118117
filename: 'dark-colorblind',
119118
theme: 'dark-protanopia-deuteranopia',
120119
source: [
121-
`src/tokens/functional/color/dark/*.json5`,
122120
`src/tokens/functional/shadow/dark.json5`,
123121
`src/tokens/functional/border/*.json5`,
124122
`src/tokens/component/*.json5`,
123+
`src/tokens/functional/color/dark/*.json5`,
125124
`src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5`,
126125
],
127126
include: [
@@ -134,10 +133,10 @@ export const themes: TokenBuildInput[] = [
134133
filename: 'dark-high-contrast',
135134
theme: 'dark-high-contrast',
136135
source: [
137-
`src/tokens/functional/color/dark/*.json5`,
138136
`src/tokens/functional/shadow/dark.json5`,
139137
`src/tokens/functional/border/*.json5`,
140138
`src/tokens/component/*.json5`,
139+
`src/tokens/functional/color/dark/*.json5`,
141140
`src/tokens/functional/color/dark/overrides/dark.high-contrast.json5`,
142141
],
143142
include: [

src/tokens/component/diffBlob.json5

Lines changed: 261 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,261 @@
1+
{
2+
diffBlob: {
3+
additionLine: {
4+
fgColor: {
5+
$value: '{fgColor.default}',
6+
$type: 'color',
7+
$extensions: {
8+
'org.primer.figma': {
9+
collection: 'mode',
10+
group: 'component',
11+
scopes: ['fgColor'],
12+
},
13+
},
14+
},
15+
bgColor: {
16+
$value: '{bgColor.success.muted}',
17+
$type: 'color',
18+
$extensions: {
19+
'org.primer.figma': {
20+
collection: 'mode',
21+
group: 'component',
22+
scopes: ['bgColor'],
23+
},
24+
},
25+
},
26+
},
27+
additionWord: {
28+
fgColor: {
29+
$value: '{fgColor.default}',
30+
$type: 'color',
31+
$extensions: {
32+
'org.primer.figma': {
33+
collection: 'mode',
34+
group: 'component',
35+
scopes: ['fgColor'],
36+
},
37+
},
38+
},
39+
bgColor: {
40+
$value: '{base.color.green.1}',
41+
$type: 'color',
42+
$extensions: {
43+
'org.primer.figma': {
44+
collection: 'mode',
45+
group: 'component',
46+
scopes: ['bgColor'],
47+
},
48+
},
49+
},
50+
},
51+
additionNum: {
52+
fgColor: {
53+
$value: '{fgColor.default}',
54+
$type: 'color',
55+
$extensions: {
56+
'org.primer.figma': {
57+
collection: 'mode',
58+
group: 'component',
59+
scopes: ['fgColor'],
60+
},
61+
},
62+
},
63+
bgColor: {
64+
$value: '{base.color.green.1}',
65+
$type: 'color',
66+
$extensions: {
67+
'org.primer.figma': {
68+
collection: 'mode',
69+
group: 'component',
70+
scopes: ['bgColor'],
71+
},
72+
},
73+
},
74+
},
75+
deletionLine: {
76+
fgColor: {
77+
$value: '{fgColor.default}',
78+
$type: 'color',
79+
$extensions: {
80+
'org.primer.figma': {
81+
collection: 'mode',
82+
group: 'component',
83+
scopes: ['fgColor'],
84+
},
85+
},
86+
},
87+
bgColor: {
88+
$value: '{bgColor.danger.muted}',
89+
$type: 'color',
90+
$extensions: {
91+
'org.primer.figma': {
92+
collection: 'mode',
93+
group: 'component',
94+
scopes: ['bgColor'],
95+
},
96+
},
97+
},
98+
},
99+
deletionWord: {
100+
fgColor: {
101+
$value: '{fgColor.default}',
102+
$type: 'color',
103+
$extensions: {
104+
'org.primer.figma': {
105+
collection: 'mode',
106+
group: 'component',
107+
scopes: ['fgColor'],
108+
},
109+
},
110+
},
111+
bgColor: {
112+
$value: '{base.color.red.1}',
113+
$type: 'color',
114+
$extensions: {
115+
'org.primer.figma': {
116+
collection: 'mode',
117+
group: 'component',
118+
scopes: ['bgColor'],
119+
},
120+
},
121+
},
122+
},
123+
deletionNum: {
124+
fgColor: {
125+
$value: '{fgColor.default}',
126+
$type: 'color',
127+
$extensions: {
128+
'org.primer.figma': {
129+
collection: 'mode',
130+
group: 'component',
131+
scopes: ['fgColor'],
132+
},
133+
},
134+
},
135+
bgColor: {
136+
$value: '{base.color.red.1}',
137+
$type: 'color',
138+
$extensions: {
139+
'org.primer.figma': {
140+
collection: 'mode',
141+
group: 'component',
142+
scopes: ['bgColor'],
143+
},
144+
},
145+
},
146+
},
147+
hunkLine: {
148+
bgColor: {
149+
$value: '{bgColor.accent.muted}',
150+
$type: 'color',
151+
$extensions: {
152+
'org.primer.figma': {
153+
collection: 'mode',
154+
group: 'component',
155+
scopes: ['bgColor'],
156+
},
157+
},
158+
},
159+
fgColor: {
160+
$value: '{fgColor.muted}',
161+
$type: 'color',
162+
$extensions: {
163+
'org.primer.figma': {
164+
collection: 'mode',
165+
group: 'component',
166+
scopes: ['fgColor'],
167+
},
168+
},
169+
},
170+
},
171+
hunkNum: {
172+
fgColor: {
173+
rest: {
174+
$value: '{fgColor.default}',
175+
$type: 'color',
176+
$extensions: {
177+
'org.primer.figma': {
178+
collection: 'mode',
179+
group: 'component',
180+
scopes: ['fgColor'],
181+
},
182+
},
183+
},
184+
hover: {
185+
$value: '{fgColor.onEmphasis}',
186+
$type: 'color',
187+
$extensions: {
188+
'org.primer.figma': {
189+
collection: 'mode',
190+
group: 'component',
191+
scopes: ['fgColor'],
192+
},
193+
},
194+
},
195+
},
196+
bgColor: {
197+
rest: {
198+
$value: '{base.color.blue.1}',
199+
$type: 'color',
200+
$extensions: {
201+
'org.primer.figma': {
202+
collection: 'mode',
203+
group: 'component',
204+
scopes: ['bgColor'],
205+
},
206+
},
207+
},
208+
hover: {
209+
$value: '{bgColor.accent.emphasis}',
210+
$type: 'color',
211+
$extensions: {
212+
'org.primer.figma': {
213+
collection: 'mode',
214+
group: 'component',
215+
scopes: ['bgColor'],
216+
},
217+
},
218+
},
219+
},
220+
},
221+
emptyNum: {
222+
bgColor: {
223+
$value: '{bgColor.muted}',
224+
$type: 'color',
225+
$extensions: {
226+
'org.primer.figma': {
227+
collection: 'mode',
228+
group: 'component',
229+
scopes: ['bgColor'],
230+
},
231+
},
232+
},
233+
},
234+
emptyLine: {
235+
bgColor: {
236+
$value: '{bgColor.muted}',
237+
$type: 'color',
238+
$extensions: {
239+
'org.primer.figma': {
240+
collection: 'mode',
241+
group: 'component',
242+
scopes: ['bgColor'],
243+
},
244+
},
245+
},
246+
},
247+
expander: {
248+
iconColor: {
249+
$value: '{fgColor.muted}',
250+
$type: 'color',
251+
$extensions: {
252+
'org.primer.figma': {
253+
collection: 'mode',
254+
group: 'component',
255+
scopes: ['fgColor'],
256+
},
257+
},
258+
},
259+
},
260+
},
261+
}

0 commit comments

Comments
 (0)