Skip to content

Commit 1e3f608

Browse files
hasparushasparus
committed
Change colors based on design's feedback
1 parent fbfd11c commit 1e3f608

File tree

4 files changed

+107
-70
lines changed

4 files changed

+107
-70
lines changed

‎src/_design-system/syntax/github-dark.json renamed to ‎src/_design-system/syntax/dark.json

Lines changed: 88 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
2+
"name": "k-colorable dark, based on GitHub Dark",
3+
"type": "dark",
4+
"semanticHighlighting": true,
25
"colors": {
36
"activityBar.activeBorder": "#f9826c",
4-
"activityBar.background": "#24292e",
5-
"activityBar.border": "#1b1f23",
7+
"activityBar.background": "#24292C",
8+
"activityBar.border": "#1b1f20",
69
"activityBar.foreground": "#e1e4e8",
710
"activityBar.inactiveForeground": "#6a737d",
811
"activityBarBadge.background": "#0366d6",
@@ -20,21 +23,21 @@
2023
"button.secondaryForeground": "#fff",
2124
"button.secondaryHoverBackground": "#586069",
2225
"checkbox.background": "#444d56",
23-
"checkbox.border": "#1b1f23",
26+
"checkbox.border": "#1b1f20",
2427
"debugToolBar.background": "#2b3036",
2528
"descriptionForeground": "#959da5",
2629
"diffEditor.insertedTextBackground": "#28a74530",
2730
"diffEditor.removedTextBackground": "#d73a4930",
2831
"dropdown.background": "#2f363d",
29-
"dropdown.border": "#1b1f23",
32+
"dropdown.border": "#1b1f20",
3033
"dropdown.foreground": "#e1e4e8",
31-
"dropdown.listBackground": "#24292e",
32-
"editor.background": "#24292e",
34+
"dropdown.listBackground": "#24292C",
35+
"editor.background": "#24292c",
3336
"editor.findMatchBackground": "#ffd33d44",
3437
"editor.findMatchHighlightBackground": "#ffd33d22",
3538
"editor.focusedStackFrameHighlightBackground": "#2b6a3033",
3639
"editor.foldBackground": "#58606915",
37-
"editor.foreground": "#6E7557",
40+
"editor.foreground": "#CFD3C5",
3841
"editor.inactiveSelectionBackground": "#3392FF22",
3942
"editor.lineHighlightBackground": "#2b3036",
4043
"editor.linkedEditingBackground": "#3392FF22",
@@ -56,20 +59,20 @@
5659
"editorBracketMatch.border": "#17E5E600",
5760
"editorCursor.foreground": "#c8e1ff",
5861
"editorError.foreground": "#f97583",
59-
"editorGroup.border": "#1b1f23",
60-
"editorGroupHeader.tabsBackground": "#1f2428",
61-
"editorGroupHeader.tabsBorder": "#1b1f23",
62+
"editorGroup.border": "#1b1f20",
63+
"editorGroupHeader.tabsBackground": "#24292C",
64+
"editorGroupHeader.tabsBorder": "#1b1f20",
6265
"editorGutter.addedBackground": "#28a745",
6366
"editorGutter.deletedBackground": "#ea4a5a",
6467
"editorGutter.modifiedBackground": "#2188ff",
6568
"editorIndentGuide.activeBackground": "#444d56",
6669
"editorIndentGuide.background": "#2f363d",
6770
"editorLineNumber.activeForeground": "#e1e4e8",
6871
"editorLineNumber.foreground": "#444d56",
69-
"editorOverviewRuler.border": "#1b1f23",
72+
"editorOverviewRuler.border": "#1b1f20",
7073
"editorWarning.foreground": "#ffea7f",
7174
"editorWhitespace.foreground": "#444d56",
72-
"editorWidget.background": "#1f2428",
75+
"editorWidget.background": "#24292C",
7376
"errorForeground": "#f97583",
7477
"focusBorder": "#005cc5",
7578
"foreground": "#d1d5da",
@@ -80,8 +83,8 @@
8083
"gitDecoration.modifiedResourceForeground": "#79b8ff",
8184
"gitDecoration.submoduleResourceForeground": "#6a737d",
8285
"gitDecoration.untrackedResourceForeground": "#34d058",
83-
"input.background": "#2f363d",
84-
"input.border": "#1b1f23",
86+
"input.background": "#2f363b",
87+
"input.border": "#1b1f20",
8588
"input.foreground": "#e1e4e8",
8689
"input.placeholderForeground": "#959da5",
8790
"list.activeSelectionBackground": "#39414a",
@@ -92,62 +95,62 @@
9295
"list.inactiveFocusBackground": "#1d2d3e",
9396
"list.inactiveSelectionBackground": "#282e34",
9497
"list.inactiveSelectionForeground": "#e1e4e8",
95-
"notificationCenterHeader.background": "#24292e",
98+
"notificationCenterHeader.background": "#24292b",
9699
"notificationCenterHeader.foreground": "#959da5",
97-
"notifications.background": "#2f363d",
98-
"notifications.border": "#1b1f23",
100+
"notifications.background": "#2f363b",
101+
"notifications.border": "#1b1f20",
99102
"notifications.foreground": "#e1e4e8",
100103
"notificationsErrorIcon.foreground": "#ea4a5a",
101104
"notificationsInfoIcon.foreground": "#79b8ff",
102105
"notificationsWarningIcon.foreground": "#ffab70",
103-
"panel.background": "#1f2428",
104-
"panel.border": "#1b1f23",
106+
"panel.background": "#24292C",
107+
"panel.border": "#1b1f20",
105108
"panelInput.border": "#2f363d",
106109
"panelTitle.activeBorder": "#f9826c",
107110
"panelTitle.activeForeground": "#e1e4e8",
108111
"panelTitle.inactiveForeground": "#959da5",
109-
"peekViewEditor.background": "#1f242888",
112+
"peekViewEditor.background": "#24292C88",
110113
"peekViewEditor.matchHighlightBackground": "#ffd33d33",
111-
"peekViewResult.background": "#1f2428",
114+
"peekViewResult.background": "#1f2425",
112115
"peekViewResult.matchHighlightBackground": "#ffd33d33",
113116
"pickerGroup.border": "#444d56",
114117
"pickerGroup.foreground": "#e1e4e8",
115118
"progressBar.background": "#0366d6",
116-
"quickInput.background": "#24292e",
119+
"quickInput.background": "#24292C",
117120
"quickInput.foreground": "#e1e4e8",
118121
"scrollbar.shadow": "#0008",
119122
"scrollbarSlider.activeBackground": "#6a737d88",
120123
"scrollbarSlider.background": "#6a737d33",
121124
"scrollbarSlider.hoverBackground": "#6a737d44",
122125
"settings.headerForeground": "#e1e4e8",
123126
"settings.modifiedItemIndicator": "#0366d6",
124-
"sideBar.background": "#1f2428",
125-
"sideBar.border": "#1b1f23",
127+
"sideBar.background": "#1f2425",
128+
"sideBar.border": "#1b1f20",
126129
"sideBar.foreground": "#d1d5da",
127-
"sideBarSectionHeader.background": "#1f2428",
128-
"sideBarSectionHeader.border": "#1b1f23",
130+
"sideBarSectionHeader.background": "#24292C",
131+
"sideBarSectionHeader.border": "#1b1f20",
129132
"sideBarSectionHeader.foreground": "#e1e4e8",
130133
"sideBarTitle.foreground": "#e1e4e8",
131-
"statusBar.background": "#24292e",
132-
"statusBar.border": "#1b1f23",
134+
"statusBar.background": "#24292C",
135+
"statusBar.border": "#1b1f20",
133136
"statusBar.debuggingBackground": "#931c06",
134137
"statusBar.debuggingForeground": "#fff",
135138
"statusBar.foreground": "#d1d5da",
136-
"statusBar.noFolderBackground": "#24292e",
139+
"statusBar.noFolderBackground": "#24292C",
137140
"statusBarItem.prominentBackground": "#282e34",
138-
"statusBarItem.remoteBackground": "#24292e",
141+
"statusBarItem.remoteBackground": "#24292C",
139142
"statusBarItem.remoteForeground": "#d1d5da",
140-
"tab.activeBackground": "#24292e",
141-
"tab.activeBorder": "#24292e",
143+
"tab.activeBackground": "#24292C",
144+
"tab.activeBorder": "#24292C",
142145
"tab.activeBorderTop": "#f9826c",
143146
"tab.activeForeground": "#e1e4e8",
144-
"tab.border": "#1b1f23",
145-
"tab.hoverBackground": "#24292e",
146-
"tab.inactiveBackground": "#1f2428",
147+
"tab.border": "#1b1f20",
148+
"tab.hoverBackground": "#24292C",
149+
"tab.inactiveBackground": "#24292C",
147150
"tab.inactiveForeground": "#959da5",
148-
"tab.unfocusedActiveBorder": "#24292e",
149-
"tab.unfocusedActiveBorderTop": "#1b1f23",
150-
"tab.unfocusedHoverBackground": "#24292e",
151+
"tab.unfocusedActiveBorder": "#24292C",
152+
"tab.unfocusedActiveBorderTop": "#1b1f20",
153+
"tab.unfocusedHoverBackground": "#24292C",
151154
"terminal.ansiBlack": "#586069",
152155
"terminal.ansiBlue": "#2188ff",
153156
"terminal.ansiBrightBlack": "#959da5",
@@ -168,25 +171,22 @@
168171
"terminal.tab.activeBorder": "#f9826c",
169172
"terminalCursor.background": "#586069",
170173
"terminalCursor.foreground": "#79b8ff",
171-
"textBlockQuote.background": "#24292e",
174+
"textBlockQuote.background": "#24292C",
172175
"textBlockQuote.border": "#444d56",
173176
"textCodeBlock.background": "#2f363d",
174177
"textLink.activeForeground": "#c8e1ff",
175178
"textLink.foreground": "#79b8ff",
176179
"textPreformat.foreground": "#d1d5da",
177180
"textSeparator.foreground": "#586069",
178-
"titleBar.activeBackground": "#24292e",
181+
"titleBar.activeBackground": "#24292C",
179182
"titleBar.activeForeground": "#e1e4e8",
180-
"titleBar.border": "#1b1f23",
181-
"titleBar.inactiveBackground": "#1f2428",
183+
"titleBar.border": "#1b1f20",
184+
"titleBar.inactiveBackground": "#24292C",
182185
"titleBar.inactiveForeground": "#959da5",
183186
"tree.indentGuidesStroke": "#2f363d",
184187
"welcomePage.buttonBackground": "#2f363d",
185188
"welcomePage.buttonHoverBackground": "#444d56"
186189
},
187-
"displayName": "GitHub Dark",
188-
"name": "github-dark",
189-
"semanticHighlighting": true,
190190
"tokenColors": [
191191
{
192192
"scope": ["comment", "punctuation.definition.comment", "string.comment"],
@@ -196,7 +196,6 @@
196196
},
197197
{
198198
"scope": [
199-
"constant",
200199
"entity.name.constant",
201200
"variable.other.constant",
202201
"variable.other.enummember",
@@ -207,9 +206,36 @@
207206
}
208207
},
209208
{
210-
"scope": ["entity", "entity.name"],
209+
"scope": "constant",
211210
"settings": {
212-
"foreground": "#b392f0"
211+
"foreground": "#F3F4F0"
212+
}
213+
},
214+
{
215+
"scope": [
216+
"keyword.other.unit.deg.css",
217+
"keyword.other.unit.ex.css",
218+
"keyword.other.unit.fr.css",
219+
"keyword.other.unit.in.css",
220+
"keyword.other.unit.mm.css",
221+
"keyword.other.unit.pc.css",
222+
"keyword.other.unit.pt.css",
223+
"keyword.other.unit.px.css",
224+
"keyword.other.unit.rem.css",
225+
"keyword.other.unit.vh.css",
226+
"keyword.other.unit.vw.css",
227+
"keyword.other.unit.vmin.css",
228+
"keyword.other.unit.vmax.css",
229+
"keyword.other.unit.percentage.css"
230+
],
231+
"settings": {
232+
"foreground": "#FFAc71"
233+
}
234+
},
235+
{
236+
"scope": ["entity", "entity.name", "variable.parameter.graphql"],
237+
"settings": {
238+
"foreground": "#F3F4F0"
213239
}
214240
},
215241
{
@@ -227,7 +253,13 @@
227253
{
228254
"scope": "keyword",
229255
"settings": {
230-
"foreground": "#f97583"
256+
"foreground": "#C2F653"
257+
}
258+
},
259+
{
260+
"scope": "keyword.operator",
261+
"settings": {
262+
"foreground": "#ECFAD1"
231263
}
232264
},
233265
{
@@ -257,9 +289,9 @@
257289
}
258290
},
259291
{
260-
"scope": "support",
292+
"scope": ["support", "support.type.graphql"],
261293
"settings": {
262-
"foreground": ""
294+
"foreground": "#FF99E0"
263295
}
264296
},
265297
{
@@ -269,7 +301,7 @@
269301
}
270302
},
271303
{
272-
"scope": "variable",
304+
"scope": ["variable", "support.type.property-name.json"],
273305
"settings": {
274306
"foreground": "#dbf6a2"
275307
}
@@ -314,7 +346,7 @@
314346
"background": "#f97583",
315347
"content": "^M",
316348
"fontStyle": "italic underline",
317-
"foreground": "#24292e"
349+
"foreground": "#24292C"
318350
}
319351
},
320352
{
@@ -324,7 +356,7 @@
324356
}
325357
},
326358
{
327-
"scope": "string variable",
359+
"scope": ["string variable"],
328360
"settings": {
329361
"foreground": "#79b8ff"
330362
}
@@ -511,11 +543,10 @@
511543
}
512544
},
513545
{
514-
"scope": ["punctuation"],
546+
"scope": ["punctuation", "meta.selectionset.graphql"],
515547
"settings": {
516548
"foreground": "#6E7557"
517549
}
518550
}
519-
],
520-
"type": "dark"
551+
]
521552
}

‎src/_design-system/syntax/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import fs from "fs/promises"
44

55
const [dark, light] = await Promise.all([
66
fs
7-
.readFile(new URL("./github-dark.json", import.meta.url), "utf-8")
7+
.readFile(new URL("./dark.json", import.meta.url), "utf-8")
88
.then(JSON.parse),
99
fs
10-
.readFile(new URL("./min-light.json", import.meta.url), "utf-8")
10+
.readFile(new URL("./light.json", import.meta.url), "utf-8")
1111
.then(JSON.parse),
1212
])
1313

‎src/_design-system/syntax/min-light.json renamed to ‎src/_design-system/syntax/light.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"name": "k-colorable light, based on Min Light",
3+
"type": "light",
4+
"semanticHighlighting": true,
25
"colors": {
36
"activityBar.background": "#f6f6f6",
47
"activityBar.foreground": "#9E9E9E",
@@ -24,7 +27,7 @@
2427
"diffEditor.insertedTextBackground": "#b7e7a44b",
2528
"diffEditor.removedTextBackground": "#e597af52",
2629
"editor.background": "#ffffff",
27-
"editor.foreground": "#212121",
30+
"editor.foreground": "#6E7557",
2831
"editor.lineHighlightBorder": "#f2f2f2",
2932
"editorBracketMatch.background": "#E7F3FF",
3033
"editorBracketMatch.border": "#c8e1ff",
@@ -108,8 +111,6 @@
108111
"titleBar.border": "#FFFFFF00",
109112
"titleBar.inactiveBackground": "#f6f6f6"
110113
},
111-
"displayName": "Min Light",
112-
"name": "min-light",
113114
"tokenColors": [
114115
{
115116
"settings": {
@@ -121,9 +122,7 @@
121122
"keyword.operator.accessor",
122123
"meta.group.braces.round.function.arguments",
123124
"meta.template.expression",
124-
"markup.fenced_code meta.embedded.block",
125-
"punctuation.operation.graphql",
126-
"punctuation"
125+
"markup.fenced_code meta.embedded.block"
127126
],
128127
"settings": {
129128
"foreground": "#363A2C"
@@ -216,10 +215,11 @@
216215
"meta.instance.constructor",
217216
"entity.other.attribute-name",
218217
"entity.name.function",
219-
"constant.keyword.clojure"
218+
"constant.keyword.clojure",
219+
"variable.parameter.graphql"
220220
],
221221
"settings": {
222-
"foreground": "#6f42c1"
222+
"foreground": "#0E0F0B"
223223
}
224224
},
225225
{
@@ -308,7 +308,12 @@
308308
"settings": {
309309
"foreground": "#E10198"
310310
}
311+
},
312+
{
313+
"scope": ["punctuation", "meta.selectionset.graphql"],
314+
"settings": {
315+
"foreground": "#6E7557"
316+
}
311317
}
312-
],
313-
"type": "light"
318+
]
314319
}

0 commit comments

Comments
 (0)