From 835e9d08554395196e1d74d61143f80e1a2c13d2 Mon Sep 17 00:00:00 2001 From: Clay Tercek <30105080+claytercek@users.noreply.github.com> Date: Sun, 22 Sep 2024 13:52:47 -0400 Subject: [PATCH 1/5] update variable color to default fg --- src/theme.js | 4 ++-- themes/github_theme.json | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/theme.js b/src/theme.js index 436c78e..ece2c9d 100644 --- a/src/theme.js +++ b/src/theme.js @@ -391,7 +391,7 @@ export function getTheme({ themeKey, name, type }) { "font_weight": null }, "variable": { - "color": lightDark("base/color/orange/6", "base/color/orange/2"), + "color": tokens["fgColor/default"], "font_style": null, "font_weight": null }, @@ -408,4 +408,4 @@ export function getTheme({ themeKey, name, type }) { } } } -} \ No newline at end of file +} diff --git a/themes/github_theme.json b/themes/github_theme.json index 30503f5..49dcaea 100644 --- a/themes/github_theme.json +++ b/themes/github_theme.json @@ -358,7 +358,7 @@ "font_weight": null }, "variable": { - "color": "#953800ff", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -730,7 +730,7 @@ "font_weight": null }, "variable": { - "color": "#953800ff", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -1102,7 +1102,7 @@ "font_weight": null }, "variable": { - "color": "#702c00ff", + "color": "#010409ff", "font_style": null, "font_weight": null }, @@ -1474,7 +1474,7 @@ "font_weight": null }, "variable": { - "color": "#953800ff", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -1846,7 +1846,7 @@ "font_weight": null }, "variable": { - "color": "#ffa657ff", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -2218,7 +2218,7 @@ "font_weight": null }, "variable": { - "color": "#ffa657ff", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -2590,7 +2590,7 @@ "font_weight": null }, "variable": { - "color": "#ffb757ff", + "color": "#ffffffff", "font_style": null, "font_weight": null }, @@ -2962,7 +2962,7 @@ "font_weight": null }, "variable": { - "color": "#ffa657ff", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -3334,7 +3334,7 @@ "font_weight": null }, "variable": { - "color": "#f69d50ff", + "color": "#d1d7e0ff", "font_style": null, "font_weight": null }, From e035f4e7230c630f63cba00efb7ca7c59aed6c37 Mon Sep 17 00:00:00 2001 From: Clay Tercek <30105080+claytercek@users.noreply.github.com> Date: Sun, 22 Sep 2024 13:58:13 -0400 Subject: [PATCH 2/5] fix improperly referenced tokens --- src/theme.js | 14 ++--- themes/github_theme.json | 117 ++++++++++++++++++--------------------- 2 files changed, 61 insertions(+), 70 deletions(-) diff --git a/src/theme.js b/src/theme.js index ece2c9d..82a74dd 100644 --- a/src/theme.js +++ b/src/theme.js @@ -266,7 +266,7 @@ export function getTheme({ themeKey, name, type }) { "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": tokens["fgColor/muted"], "font_style": null, "font_weight": 700 }, @@ -296,12 +296,12 @@ export function getTheme({ themeKey, name, type }) { "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": tokens["fgColor/default"], "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", + "color": tokens["fgColor/placeholder"], "font_style": "italic", "font_weight": null }, @@ -311,7 +311,7 @@ export function getTheme({ themeKey, name, type }) { "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": tokens["fgColor/default"], "font_style": null, "font_weight": null }, @@ -321,17 +321,17 @@ export function getTheme({ themeKey, name, type }) { "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": tokens["fgColor/default"], "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": tokens["fgColor/default"], "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": tokens["fgColor/default"], "font_style": null, "font_weight": null }, diff --git a/themes/github_theme.json b/themes/github_theme.json index 49dcaea..693cded 100644 --- a/themes/github_theme.json +++ b/themes/github_theme.json @@ -233,7 +233,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#59636eff", "font_style": null, "font_weight": 700 }, @@ -263,12 +263,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -278,7 +277,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -288,17 +287,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -605,7 +604,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#59636eff", "font_style": null, "font_weight": 700 }, @@ -635,12 +634,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -650,7 +648,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -660,17 +658,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -977,7 +975,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#454c54ff", "font_style": null, "font_weight": 700 }, @@ -1007,12 +1005,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#010409ff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -1022,7 +1019,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#010409ff", "font_style": null, "font_weight": null }, @@ -1032,17 +1029,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#010409ff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#010409ff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#010409ff", "font_style": null, "font_weight": null }, @@ -1349,7 +1346,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#59636eff", "font_style": null, "font_weight": 700 }, @@ -1379,12 +1376,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -1394,7 +1390,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -1404,17 +1400,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#1f2328ff", "font_style": null, "font_weight": null }, @@ -1721,7 +1717,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#9198a1ff", "font_style": null, "font_weight": 700 }, @@ -1751,12 +1747,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -1766,7 +1761,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -1776,17 +1771,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -2093,7 +2088,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#9198a1ff", "font_style": null, "font_weight": 700 }, @@ -2123,12 +2118,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -2138,7 +2132,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -2148,17 +2142,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -2465,7 +2459,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#b7bdc8ff", "font_style": null, "font_weight": 700 }, @@ -2495,12 +2489,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#ffffffff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -2510,7 +2503,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#ffffffff", "font_style": null, "font_weight": null }, @@ -2520,17 +2513,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#ffffffff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#ffffffff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#ffffffff", "font_style": null, "font_weight": null }, @@ -2837,7 +2830,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#9198a1ff", "font_style": null, "font_weight": 700 }, @@ -2867,12 +2860,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -2882,7 +2874,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -2892,17 +2884,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#f0f6fcff", "font_style": null, "font_weight": null }, @@ -3209,7 +3201,7 @@ "font_weight": null }, "hint": { - "color": "fgColor/muted", + "color": "#9198a1ff", "font_style": null, "font_weight": 700 }, @@ -3239,12 +3231,11 @@ "font_weight": null }, "operator": { - "color": "fgColor/default", + "color": "#d1d7e0ff", "font_style": null, "font_weight": null }, "predictive": { - "color": "fgColor/placeholder", "font_style": "italic", "font_weight": null }, @@ -3254,7 +3245,7 @@ "font_weight": null }, "primary": { - "color": "fgColor/default", + "color": "#d1d7e0ff", "font_style": null, "font_weight": null }, @@ -3264,17 +3255,17 @@ "font_weight": null }, "punctuation": { - "color": "fgColor/default", + "color": "#d1d7e0ff", "font_style": null, "font_weight": null }, "punctuation.bracket": { - "color": "fgColor/default", + "color": "#d1d7e0ff", "font_style": null, "font_weight": null }, "punctuation.delimiter": { - "color": "fgColor/default", + "color": "#d1d7e0ff", "font_style": null, "font_weight": null }, From b96a09b3c9264bda9c2ad458ee304b8e099ca210 Mon Sep 17 00:00:00 2001 From: Clay Tercek <30105080+claytercek@users.noreply.github.com> Date: Sun, 22 Sep 2024 14:41:25 -0400 Subject: [PATCH 3/5] improve terminal and file tree readability --- src/theme.js | 12 +++-- themes/github_theme.json | 99 +++++++++++++++++++++++++--------------- 2 files changed, 71 insertions(+), 40 deletions(-) diff --git a/src/theme.js b/src/theme.js index 82a74dd..584b7e0 100644 --- a/src/theme.js +++ b/src/theme.js @@ -78,6 +78,10 @@ export function getTheme({ themeKey, name, type }) { "ghost_element.hover": tokens['bgColor/default'], "ghost_element.selected": tokens['bgColor/neutral-muted'], + "hidden": tokens['fgColor/disabled'], + "hidden.background": tokens['bgColor/disabled'], + "hidden.border": tokens['borderColor/disabled'], + "hint": tokens['fgColor/muted'], "hint.background": tokens['bgColor/muted'], "hint.border": tokens['borderColor/muted'], @@ -90,7 +94,7 @@ export function getTheme({ themeKey, name, type }) { "icon.disabled": tokens['fgColor/disabled'], "icon.placeholder": tokens['fgColor/fgColor/placeholder'], - "ignored": tokens['fgColor/disabled'], + "ignored": tokens['fgColor/muted'], "ignored.background": tokens['bgColor/disabled'], "ignored.border": tokens['borderColor/disabled'], @@ -163,13 +167,13 @@ export function getTheme({ themeKey, name, type }) { "terminal.background": tokens['bgColor/inset'], "terminal.bright_foreground": tokens['fgColor/onEmphasis'], - "terminal.dim_foreground": tokens['fgColor/default'], - "terminal.foreground": tokens['fgColor/muted'], + "terminal.dim_foreground": tokens['fgColor/muted'], + "terminal.foreground": tokens['fgColor/default'], "text": tokens['fgColor/default'], "text.accent": tokens['fgColor/accent'], "text.disabled": tokens['fgColor/disabled'], - "text.muted": tokens['fgColor/muted'], + "text.muted": tokens['fgColor/default'], "text.placeholder": tokens['fgColor/placeholder'], "title_bar.background": tokens['bgColor/inset'], diff --git a/themes/github_theme.json b/themes/github_theme.json index 693cded..0b2d8c8 100644 --- a/themes/github_theme.json +++ b/themes/github_theme.json @@ -52,6 +52,9 @@ "ghost_element.disabled": "#eff2f5ff", "ghost_element.hover": "#ffffffff", "ghost_element.selected": "#818b981f", + "hidden": "#818b98ff", + "hidden.background": "#eff2f5ff", + "hidden.border": "#818b981a", "hint": "#59636eff", "hint.background": "#f6f8faff", "hint.border": "#d1d9e0b3", @@ -61,7 +64,7 @@ "icon.accent": "#0969daff", "icon.muted": "#59636eff", "icon.disabled": "#818b98ff", - "ignored": "#818b98ff", + "ignored": "#59636eff", "ignored.background": "#eff2f5ff", "ignored.border": "#818b981a", "info": "#9a6700ff", @@ -118,12 +121,12 @@ "terminal.ansi.dim_yellow": "#4d2d00ff", "terminal.background": "#f6f8faff", "terminal.bright_foreground": "#ffffffff", - "terminal.dim_foreground": "#1f2328ff", - "terminal.foreground": "#59636eff", + "terminal.dim_foreground": "#59636eff", + "terminal.foreground": "#1f2328ff", "text": "#1f2328ff", "text.accent": "#0969daff", "text.disabled": "#818b98ff", - "text.muted": "#59636eff", + "text.muted": "#1f2328ff", "title_bar.background": "#f6f8faff", "toolbar.background": "#ffffffff", "unreachable": "#818b98ff", @@ -423,6 +426,9 @@ "ghost_element.disabled": "#eff2f5ff", "ghost_element.hover": "#ffffffff", "ghost_element.selected": "#818b981f", + "hidden": "#818b98ff", + "hidden.background": "#eff2f5ff", + "hidden.border": "#818b981a", "hint": "#59636eff", "hint.background": "#f6f8faff", "hint.border": "#d1d9e0b3", @@ -432,7 +438,7 @@ "icon.accent": "#0969daff", "icon.muted": "#59636eff", "icon.disabled": "#818b98ff", - "ignored": "#818b98ff", + "ignored": "#59636eff", "ignored.background": "#eff2f5ff", "ignored.border": "#818b981a", "info": "#9a6700ff", @@ -489,12 +495,12 @@ "terminal.ansi.dim_yellow": "#4d2d00ff", "terminal.background": "#f6f8faff", "terminal.bright_foreground": "#ffffffff", - "terminal.dim_foreground": "#1f2328ff", - "terminal.foreground": "#59636eff", + "terminal.dim_foreground": "#59636eff", + "terminal.foreground": "#1f2328ff", "text": "#1f2328ff", "text.accent": "#0969daff", "text.disabled": "#818b98ff", - "text.muted": "#59636eff", + "text.muted": "#1f2328ff", "title_bar.background": "#f6f8faff", "toolbar.background": "#ffffffff", "unreachable": "#818b98ff", @@ -794,6 +800,9 @@ "ghost_element.disabled": "#e0e6ebff", "ghost_element.hover": "#ffffffff", "ghost_element.selected": "#e0e6ebff", + "hidden": "#59636eff", + "hidden.background": "#e0e6ebff", + "hidden.border": "#59636e1f", "hint": "#454c54ff", "hint.background": "#e6eaefff", "hint.border": "#454c54ff", @@ -803,7 +812,7 @@ "icon.accent": "#023b95ff", "icon.muted": "#454c54ff", "icon.disabled": "#59636eff", - "ignored": "#59636eff", + "ignored": "#454c54ff", "ignored.background": "#e0e6ebff", "ignored.border": "#59636e1f", "info": "#603700ff", @@ -860,12 +869,12 @@ "terminal.ansi.dim_yellow": "#3f2200ff", "terminal.background": "#eff2f5ff", "terminal.bright_foreground": "#ffffffff", - "terminal.dim_foreground": "#010409ff", - "terminal.foreground": "#454c54ff", + "terminal.dim_foreground": "#454c54ff", + "terminal.foreground": "#010409ff", "text": "#010409ff", "text.accent": "#023b95ff", "text.disabled": "#59636eff", - "text.muted": "#454c54ff", + "text.muted": "#010409ff", "title_bar.background": "#eff2f5ff", "toolbar.background": "#ffffffff", "unreachable": "#59636eff", @@ -1165,6 +1174,9 @@ "ghost_element.disabled": "#eff2f5ff", "ghost_element.hover": "#ffffffff", "ghost_element.selected": "#818b981f", + "hidden": "#818b98ff", + "hidden.background": "#eff2f5ff", + "hidden.border": "#818b981a", "hint": "#59636eff", "hint.background": "#f6f8faff", "hint.border": "#d1d9e0b3", @@ -1174,7 +1186,7 @@ "icon.accent": "#0969daff", "icon.muted": "#59636eff", "icon.disabled": "#818b98ff", - "ignored": "#818b98ff", + "ignored": "#59636eff", "ignored.background": "#eff2f5ff", "ignored.border": "#818b981a", "info": "#9a6700ff", @@ -1231,12 +1243,12 @@ "terminal.ansi.dim_yellow": "#4d2d00ff", "terminal.background": "#f6f8faff", "terminal.bright_foreground": "#ffffffff", - "terminal.dim_foreground": "#1f2328ff", - "terminal.foreground": "#59636eff", + "terminal.dim_foreground": "#59636eff", + "terminal.foreground": "#1f2328ff", "text": "#1f2328ff", "text.accent": "#0969daff", "text.disabled": "#818b98ff", - "text.muted": "#59636eff", + "text.muted": "#1f2328ff", "title_bar.background": "#f6f8faff", "toolbar.background": "#ffffffff", "unreachable": "#818b98ff", @@ -1536,6 +1548,9 @@ "ghost_element.disabled": "#212830ff", "ghost_element.hover": "#0d1117ff", "ghost_element.selected": "#656c7633", + "hidden": "#656c7699", + "hidden.background": "#212830ff", + "hidden.border": "#656c761a", "hint": "#9198a1ff", "hint.background": "#151b23ff", "hint.border": "#3d444db3", @@ -1545,7 +1560,7 @@ "icon.accent": "#4493f8ff", "icon.muted": "#9198a1ff", "icon.disabled": "#656c7699", - "ignored": "#656c7699", + "ignored": "#9198a1ff", "ignored.background": "#212830ff", "ignored.border": "#656c761a", "info": "#d29922ff", @@ -1602,12 +1617,12 @@ "terminal.ansi.dim_yellow": "#d29922ff", "terminal.background": "#010409ff", "terminal.bright_foreground": "#ffffffff", - "terminal.dim_foreground": "#f0f6fcff", - "terminal.foreground": "#9198a1ff", + "terminal.dim_foreground": "#9198a1ff", + "terminal.foreground": "#f0f6fcff", "text": "#f0f6fcff", "text.accent": "#4493f8ff", "text.disabled": "#656c7699", - "text.muted": "#9198a1ff", + "text.muted": "#f0f6fcff", "title_bar.background": "#010409ff", "toolbar.background": "#0d1117ff", "unreachable": "#656c7699", @@ -1907,6 +1922,9 @@ "ghost_element.disabled": "#212830ff", "ghost_element.hover": "#0d1117ff", "ghost_element.selected": "#656c7633", + "hidden": "#656c7699", + "hidden.background": "#212830ff", + "hidden.border": "#656c761a", "hint": "#9198a1ff", "hint.background": "#151b23ff", "hint.border": "#3d444db3", @@ -1916,7 +1934,7 @@ "icon.accent": "#4493f8ff", "icon.muted": "#9198a1ff", "icon.disabled": "#656c7699", - "ignored": "#656c7699", + "ignored": "#9198a1ff", "ignored.background": "#212830ff", "ignored.border": "#656c761a", "info": "#d29922ff", @@ -1973,12 +1991,12 @@ "terminal.ansi.dim_yellow": "#d29922ff", "terminal.background": "#010409ff", "terminal.bright_foreground": "#ffffffff", - "terminal.dim_foreground": "#f0f6fcff", - "terminal.foreground": "#9198a1ff", + "terminal.dim_foreground": "#9198a1ff", + "terminal.foreground": "#f0f6fcff", "text": "#f0f6fcff", "text.accent": "#4493f8ff", "text.disabled": "#656c7699", - "text.muted": "#9198a1ff", + "text.muted": "#f0f6fcff", "title_bar.background": "#010409ff", "toolbar.background": "#0d1117ff", "unreachable": "#656c7699", @@ -2278,6 +2296,9 @@ "ghost_element.disabled": "#262c36ff", "ghost_element.hover": "#010409ff", "ghost_element.selected": "#212830ff", + "hidden": "#9198a199", + "hidden.background": "#262c36ff", + "hidden.border": "#9198a11f", "hint": "#b7bdc8ff", "hint.background": "#151b23ff", "hint.border": "#b7bdc8ff", @@ -2287,7 +2308,7 @@ "icon.accent": "#74b9ffff", "icon.muted": "#b7bdc8ff", "icon.disabled": "#9198a199", - "ignored": "#9198a199", + "ignored": "#b7bdc8ff", "ignored.background": "#262c36ff", "ignored.border": "#9198a11f", "info": "#f0b72fff", @@ -2344,12 +2365,12 @@ "terminal.ansi.dim_yellow": "#f0b72fff", "terminal.background": "#010409ff", "terminal.bright_foreground": "#ffffffff", - "terminal.dim_foreground": "#ffffffff", - "terminal.foreground": "#b7bdc8ff", + "terminal.dim_foreground": "#b7bdc8ff", + "terminal.foreground": "#ffffffff", "text": "#ffffffff", "text.accent": "#74b9ffff", "text.disabled": "#9198a199", - "text.muted": "#b7bdc8ff", + "text.muted": "#ffffffff", "title_bar.background": "#010409ff", "toolbar.background": "#010409ff", "unreachable": "#9198a199", @@ -2649,6 +2670,9 @@ "ghost_element.disabled": "#212830ff", "ghost_element.hover": "#0d1117ff", "ghost_element.selected": "#656c7633", + "hidden": "#656c7699", + "hidden.background": "#212830ff", + "hidden.border": "#656c761a", "hint": "#9198a1ff", "hint.background": "#151b23ff", "hint.border": "#3d444db3", @@ -2658,7 +2682,7 @@ "icon.accent": "#4493f8ff", "icon.muted": "#9198a1ff", "icon.disabled": "#656c7699", - "ignored": "#656c7699", + "ignored": "#9198a1ff", "ignored.background": "#212830ff", "ignored.border": "#656c761a", "info": "#d29922ff", @@ -2715,12 +2739,12 @@ "terminal.ansi.dim_yellow": "#d29922ff", "terminal.background": "#010409ff", "terminal.bright_foreground": "#ffffffff", - "terminal.dim_foreground": "#f0f6fcff", - "terminal.foreground": "#9198a1ff", + "terminal.dim_foreground": "#9198a1ff", + "terminal.foreground": "#f0f6fcff", "text": "#f0f6fcff", "text.accent": "#4493f8ff", "text.disabled": "#656c7699", - "text.muted": "#9198a1ff", + "text.muted": "#f0f6fcff", "title_bar.background": "#010409ff", "toolbar.background": "#0d1117ff", "unreachable": "#656c7699", @@ -3020,6 +3044,9 @@ "ghost_element.disabled": "#2a313cff", "ghost_element.hover": "#212830ff", "ghost_element.selected": "#656c7633", + "hidden": "#656c76ff", + "hidden.background": "#2a313cff", + "hidden.border": "#656c761a", "hint": "#9198a1ff", "hint.background": "#262c36ff", "hint.border": "#3d444db3", @@ -3029,7 +3056,7 @@ "icon.accent": "#478be6ff", "icon.muted": "#9198a1ff", "icon.disabled": "#656c76ff", - "ignored": "#656c76ff", + "ignored": "#9198a1ff", "ignored.background": "#2a313cff", "ignored.border": "#656c761a", "info": "#c69026ff", @@ -3086,12 +3113,12 @@ "terminal.ansi.dim_yellow": "#c69026ff", "terminal.background": "#151b23ff", "terminal.bright_foreground": "#f0f6fcff", - "terminal.dim_foreground": "#d1d7e0ff", - "terminal.foreground": "#9198a1ff", + "terminal.dim_foreground": "#9198a1ff", + "terminal.foreground": "#d1d7e0ff", "text": "#d1d7e0ff", "text.accent": "#478be6ff", "text.disabled": "#656c76ff", - "text.muted": "#9198a1ff", + "text.muted": "#d1d7e0ff", "title_bar.background": "#151b23ff", "toolbar.background": "#212830ff", "unreachable": "#656c76ff", From 300e1153cae130be19ca53e55a6567593233b9fe Mon Sep 17 00:00:00 2001 From: Clay Tercek <30105080+claytercek@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:56:51 -0400 Subject: [PATCH 4/5] higher contrast search and players --- src/theme.js | 54 ++++- themes/github_theme.json | 459 ++++++++++++++++++++++----------------- 2 files changed, 306 insertions(+), 207 deletions(-) diff --git a/src/theme.js b/src/theme.js index 584b7e0..e513ce4 100644 --- a/src/theme.js +++ b/src/theme.js @@ -18,8 +18,44 @@ export function getTheme({ themeKey, name, type }) { return themeKey.startsWith('light') ? tokens[lightTokenName] : tokens[darkTokenName] } + + /** + * @param {string} tokenName + * @param {number} alphaValue + */ + const alpha = (tokenName, alphaValue) => { + const baseToken = tokens[tokenName]; + if (!baseToken) { + console.warn(`Token '${tokenName}' not found in theme '${themeKey}'`) + return null; + } + + const hexAlpha = Math.round(alphaValue * 255).toString(16).padStart(2, '0'); + + // Remove the '#' if present + let color = baseToken.replace('#', ''); + + // If it's already an 8-digit HEXA, replace the last two characters + if (color.length === 8) { + color = color.slice(0, 6) + hexAlpha; + } + // If it's a 6-digit HEX, append the new alpha + else if (color.length === 6) { + color += hexAlpha; + } + // If it's a 3-digit HEX, expand it and append the new alpha + else if (color.length === 3) { + color = color.split('').map(char => char + char).join('') + hexAlpha; + } + else { + console.warn(`Invalid color format for token '${tokenName}': ${baseToken}`); + return baseToken; + } + + return '#' + color; + } + return { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", appearance: type, name, style: { @@ -50,8 +86,8 @@ export function getTheme({ themeKey, name, type }) { "editor.active_line_number": tokens['fgColor/default'], "editor.active_wrap_guide": tokens['borderColor/muted'], "editor.background": tokens['bgColor/default'], - "editor.document_highlight.read_background": tokens['bgColor/accent-muted'], - "editor.document_highlight.write_background": tokens['bgColor/accent-emphasis'], + "editor.document_highlight.read_background": alpha("fgColor/accent", 0.3), + "editor.document_highlight.write_background": alpha("fgColor/accent", 0.2), "editor.foreground": tokens['fgColor/default'], "editor.gutter.background": tokens['bgColor/default'], "editor.highlighted_line.background": tokens['bgColor/neutral-muted'], @@ -126,7 +162,7 @@ export function getTheme({ themeKey, name, type }) { "scrollbar.track.border": tokens['borderColor/transparent'], "scrollbar_thumb.background": tokens['bgColor/neutal-muted'], - "search.match_background": tokens['bgColor/attention-muted'], + "search.match_background": alpha("base/color/yellow/1", 0.3), "status_bar.background": tokens['bgColor/inset'], @@ -198,9 +234,9 @@ export function getTheme({ themeKey, name, type }) { "teal", "red" ].map(color => ({ - "cursor": tokens[`data/${color}/color`], - "background": tokens[`data/${color}/color/muted`], - "border": tokens[`data/${color}/color/muted`] + "cursor": tokens[`data/${color}/color/emphasis`], + "background": tokens[`data/${color}/color/emphasis`], + "selection": alpha(`data/${color}/color/emphasis`, 0.4) })), "syntax": { @@ -356,8 +392,8 @@ export function getTheme({ themeKey, name, type }) { }, "string.escape": { "color": lightDark("base/color/green/6", "base/color/green/1"), - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": lightDark("base/color/blue/8", "base/color/blue/1"), diff --git a/themes/github_theme.json b/themes/github_theme.json index 0b2d8c8..b897538 100644 --- a/themes/github_theme.json +++ b/themes/github_theme.json @@ -4,7 +4,6 @@ "author": "Pyae Sone Aung", "themes": [ { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "light", "name": "Github Light", "style": { @@ -29,8 +28,8 @@ "editor.active_line_number": "#1f2328ff", "editor.active_wrap_guide": "#d1d9e0b3", "editor.background": "#ffffffff", - "editor.document_highlight.read_background": "#ddf4ffff", - "editor.document_highlight.write_background": "#0969daff", + "editor.document_highlight.read_background": "#0969da4d", + "editor.document_highlight.write_background": "#0969da33", "editor.foreground": "#1f2328ff", "editor.gutter.background": "#ffffffff", "editor.highlighted_line.background": "#818b981f", @@ -86,7 +85,7 @@ "scrollbar.thumb.hover_background": "#f6f8faff", "scrollbar.track.background": "#ffffff00", "scrollbar.track.border": "#ffffff00", - "search.match_background": "#fff8c5ff", + "search.match_background": "#fae17d4d", "status_bar.background": "#f6f8faff", "success": "#1a7f37ff", "success.background": "#dafbe1ff", @@ -137,36 +136,44 @@ "warning.border": "#d1d9e0b3", "players": [ { - "background": "#d1f0ffff", - "border": "#d1f0ffff" + "cursor": "#006edbff", + "background": "#006edbff", + "selection": "#006edb66" }, { - "background": "#ffe7d1ff", - "border": "#ffe7d1ff" + "cursor": "#eb670fff", + "background": "#eb670fff", + "selection": "#eb670f66" }, { - "background": "#ffe5f1ff", - "border": "#ffe5f1ff" + "cursor": "#ce2c85ff", + "background": "#ce2c85ff", + "selection": "#ce2c8566" }, { - "background": "#caf7caff", - "border": "#caf7caff" + "cursor": "#30a147ff", + "background": "#30a147ff", + "selection": "#30a14766" }, { - "background": "#f1e5ffff", - "border": "#f1e5ffff" + "cursor": "#894cebff", + "background": "#894cebff", + "selection": "#894ceb66" }, { - "background": "#ffec9eff", - "border": "#ffec9eff" + "cursor": "#b88700ff", + "background": "#b88700ff", + "selection": "#b8870066" }, { - "background": "#c7f5efff", - "border": "#c7f5efff" + "cursor": "#179b9bff", + "background": "#179b9bff", + "selection": "#179b9b66" }, { - "background": "#ffe2e0ff", - "border": "#ffe2e0ff" + "cursor": "#df0c24ff", + "background": "#df0c24ff", + "selection": "#df0c2466" } ], "syntax": { @@ -321,8 +328,8 @@ }, "string.escape": { "color": "#116329ff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#0a3069ff", @@ -378,7 +385,6 @@ } }, { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "light", "name": "Github Light Colorblind", "style": { @@ -403,8 +409,8 @@ "editor.active_line_number": "#1f2328ff", "editor.active_wrap_guide": "#d1d9e0b3", "editor.background": "#ffffffff", - "editor.document_highlight.read_background": "#ddf4ffff", - "editor.document_highlight.write_background": "#0969daff", + "editor.document_highlight.read_background": "#0969da4d", + "editor.document_highlight.write_background": "#0969da33", "editor.foreground": "#1f2328ff", "editor.gutter.background": "#ffffffff", "editor.highlighted_line.background": "#818b981f", @@ -460,7 +466,7 @@ "scrollbar.thumb.hover_background": "#f6f8faff", "scrollbar.track.background": "#ffffff00", "scrollbar.track.border": "#ffffff00", - "search.match_background": "#fff8c5ff", + "search.match_background": "#fae17d4d", "status_bar.background": "#f6f8faff", "success": "#0969daff", "success.background": "#ddf4ffff", @@ -511,36 +517,44 @@ "warning.border": "#d1d9e0b3", "players": [ { - "background": "#d1f0ffff", - "border": "#d1f0ffff" + "cursor": "#006edbff", + "background": "#006edbff", + "selection": "#006edb66" }, { - "background": "#ffe7d1ff", - "border": "#ffe7d1ff" + "cursor": "#eb670fff", + "background": "#eb670fff", + "selection": "#eb670f66" }, { - "background": "#ffe5f1ff", - "border": "#ffe5f1ff" + "cursor": "#ce2c85ff", + "background": "#ce2c85ff", + "selection": "#ce2c8566" }, { - "background": "#caf7caff", - "border": "#caf7caff" + "cursor": "#30a147ff", + "background": "#30a147ff", + "selection": "#30a14766" }, { - "background": "#f1e5ffff", - "border": "#f1e5ffff" + "cursor": "#894cebff", + "background": "#894cebff", + "selection": "#894ceb66" }, { - "background": "#ffec9eff", - "border": "#ffec9eff" + "cursor": "#b88700ff", + "background": "#b88700ff", + "selection": "#b8870066" }, { - "background": "#c7f5efff", - "border": "#c7f5efff" + "cursor": "#179b9bff", + "background": "#179b9bff", + "selection": "#179b9b66" }, { - "background": "#ffe2e0ff", - "border": "#ffe2e0ff" + "cursor": "#df0c24ff", + "background": "#df0c24ff", + "selection": "#df0c2466" } ], "syntax": { @@ -695,8 +709,8 @@ }, "string.escape": { "color": "#116329ff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#0a3069ff", @@ -752,7 +766,6 @@ } }, { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "light", "name": "Github Light High Contrast", "style": { @@ -777,8 +790,8 @@ "editor.active_line_number": "#010409ff", "editor.active_wrap_guide": "#454c54ff", "editor.background": "#ffffffff", - "editor.document_highlight.read_background": "#dff7ffff", - "editor.document_highlight.write_background": "#0349b4ff", + "editor.document_highlight.read_background": "#023b954d", + "editor.document_highlight.write_background": "#023b9533", "editor.foreground": "#010409ff", "editor.gutter.background": "#ffffffff", "editor.highlighted_line.background": "#e0e6ebff", @@ -834,7 +847,7 @@ "scrollbar.thumb.hover_background": "#e6eaefff", "scrollbar.track.background": "#ffffff00", "scrollbar.track.border": "#ffffff00", - "search.match_background": "#fcf7beff", + "search.match_background": "#f0ce534d", "status_bar.background": "#eff2f5ff", "success": "#024c1aff", "success.background": "#d2fedbff", @@ -885,36 +898,44 @@ "warning.border": "#454c54ff", "players": [ { - "background": "#d1f0ffff", - "border": "#d1f0ffff" + "cursor": "#006edbff", + "background": "#006edbff", + "selection": "#006edb66" }, { - "background": "#ffe7d1ff", - "border": "#ffe7d1ff" + "cursor": "#eb670fff", + "background": "#eb670fff", + "selection": "#eb670f66" }, { - "background": "#ffe5f1ff", - "border": "#ffe5f1ff" + "cursor": "#ce2c85ff", + "background": "#ce2c85ff", + "selection": "#ce2c8566" }, { - "background": "#caf7caff", - "border": "#caf7caff" + "cursor": "#30a147ff", + "background": "#30a147ff", + "selection": "#30a14766" }, { - "background": "#f1e5ffff", - "border": "#f1e5ffff" + "cursor": "#894cebff", + "background": "#894cebff", + "selection": "#894ceb66" }, { - "background": "#ffec9eff", - "border": "#ffec9eff" + "cursor": "#b88700ff", + "background": "#b88700ff", + "selection": "#b8870066" }, { - "background": "#c7f5efff", - "border": "#c7f5efff" + "cursor": "#179b9bff", + "background": "#179b9bff", + "selection": "#179b9b66" }, { - "background": "#ffe2e0ff", - "border": "#ffe2e0ff" + "cursor": "#df0c24ff", + "background": "#df0c24ff", + "selection": "#df0c2466" } ], "syntax": { @@ -1069,8 +1090,8 @@ }, "string.escape": { "color": "#024c1aff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#032563ff", @@ -1126,7 +1147,6 @@ } }, { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "light", "name": "Github Light Tritanopia", "style": { @@ -1151,8 +1171,8 @@ "editor.active_line_number": "#1f2328ff", "editor.active_wrap_guide": "#d1d9e0b3", "editor.background": "#ffffffff", - "editor.document_highlight.read_background": "#ddf4ffff", - "editor.document_highlight.write_background": "#0969daff", + "editor.document_highlight.read_background": "#0969da4d", + "editor.document_highlight.write_background": "#0969da33", "editor.foreground": "#1f2328ff", "editor.gutter.background": "#ffffffff", "editor.highlighted_line.background": "#818b981f", @@ -1208,7 +1228,7 @@ "scrollbar.thumb.hover_background": "#f6f8faff", "scrollbar.track.background": "#ffffff00", "scrollbar.track.border": "#ffffff00", - "search.match_background": "#fff8c5ff", + "search.match_background": "#fae17d4d", "status_bar.background": "#f6f8faff", "success": "#0969daff", "success.background": "#ddf4ffff", @@ -1259,36 +1279,44 @@ "warning.border": "#d1d9e0b3", "players": [ { - "background": "#d1f0ffff", - "border": "#d1f0ffff" + "cursor": "#006edbff", + "background": "#006edbff", + "selection": "#006edb66" }, { - "background": "#ffe7d1ff", - "border": "#ffe7d1ff" + "cursor": "#eb670fff", + "background": "#eb670fff", + "selection": "#eb670f66" }, { - "background": "#ffe5f1ff", - "border": "#ffe5f1ff" + "cursor": "#ce2c85ff", + "background": "#ce2c85ff", + "selection": "#ce2c8566" }, { - "background": "#caf7caff", - "border": "#caf7caff" + "cursor": "#30a147ff", + "background": "#30a147ff", + "selection": "#30a14766" }, { - "background": "#f1e5ffff", - "border": "#f1e5ffff" + "cursor": "#894cebff", + "background": "#894cebff", + "selection": "#894ceb66" }, { - "background": "#ffec9eff", - "border": "#ffec9eff" + "cursor": "#b88700ff", + "background": "#b88700ff", + "selection": "#b8870066" }, { - "background": "#c7f5efff", - "border": "#c7f5efff" + "cursor": "#179b9bff", + "background": "#179b9bff", + "selection": "#179b9b66" }, { - "background": "#ffe2e0ff", - "border": "#ffe2e0ff" + "cursor": "#df0c24ff", + "background": "#df0c24ff", + "selection": "#df0c2466" } ], "syntax": { @@ -1443,8 +1471,8 @@ }, "string.escape": { "color": "#116329ff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#0a3069ff", @@ -1500,7 +1528,6 @@ } }, { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "dark", "name": "Github Dark", "style": { @@ -1525,8 +1552,8 @@ "editor.active_line_number": "#f0f6fcff", "editor.active_wrap_guide": "#3d444db3", "editor.background": "#0d1117ff", - "editor.document_highlight.read_background": "#388bfd1a", - "editor.document_highlight.write_background": "#1f6febff", + "editor.document_highlight.read_background": "#4493f84d", + "editor.document_highlight.write_background": "#4493f833", "editor.foreground": "#f0f6fcff", "editor.gutter.background": "#0d1117ff", "editor.highlighted_line.background": "#656c7633", @@ -1582,7 +1609,7 @@ "scrollbar.thumb.hover_background": "#151b23ff", "scrollbar.track.background": "#00000000", "scrollbar.track.border": "#00000000", - "search.match_background": "#bb800926", + "search.match_background": "#f2cc604d", "status_bar.background": "#010409ff", "success": "#3fb950ff", "success.background": "#2ea04326", @@ -1633,36 +1660,44 @@ "warning.border": "#3d444db3", "players": [ { - "background": "#001a47ff", - "border": "#001a47ff" + "cursor": "#0576ffff", + "background": "#0576ffff", + "selection": "#0576ff66" }, { - "background": "#311708ff", - "border": "#311708ff" + "cursor": "#984b10ff", + "background": "#984b10ff", + "selection": "#984b1066" }, { - "background": "#2d1524ff", - "border": "#2d1524ff" + "cursor": "#d34591ff", + "background": "#d34591ff", + "selection": "#d3459166" }, { - "background": "#122117ff", - "border": "#122117ff" + "cursor": "#2f6f37ff", + "background": "#2f6f37ff", + "selection": "#2f6f3766" }, { - "background": "#211047ff", - "border": "#211047ff" + "cursor": "#975bf1ff", + "background": "#975bf1ff", + "selection": "#975bf166" }, { - "background": "#2e1a00ff", - "border": "#2e1a00ff" + "cursor": "#895906ff", + "background": "#895906ff", + "selection": "#89590666" }, { - "background": "#041f25ff", - "border": "#041f25ff" + "cursor": "#106c70ff", + "background": "#106c70ff", + "selection": "#106c7066" }, { - "background": "#3c0614ff", - "border": "#3c0614ff" + "cursor": "#eb3342ff", + "background": "#eb3342ff", + "selection": "#eb334266" } ], "syntax": { @@ -1817,8 +1852,8 @@ }, "string.escape": { "color": "#7ee787ff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#a5d6ffff", @@ -1874,7 +1909,6 @@ } }, { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "dark", "name": "Github Dark Colorblind", "style": { @@ -1899,8 +1933,8 @@ "editor.active_line_number": "#f0f6fcff", "editor.active_wrap_guide": "#3d444db3", "editor.background": "#0d1117ff", - "editor.document_highlight.read_background": "#388bfd1a", - "editor.document_highlight.write_background": "#1f6febff", + "editor.document_highlight.read_background": "#4493f84d", + "editor.document_highlight.write_background": "#4493f833", "editor.foreground": "#f0f6fcff", "editor.gutter.background": "#0d1117ff", "editor.highlighted_line.background": "#656c7633", @@ -1956,7 +1990,7 @@ "scrollbar.thumb.hover_background": "#151b23ff", "scrollbar.track.background": "#00000000", "scrollbar.track.border": "#00000000", - "search.match_background": "#bb800926", + "search.match_background": "#f2cc604d", "status_bar.background": "#010409ff", "success": "#58a6ffff", "success.background": "#388bfd26", @@ -2007,36 +2041,44 @@ "warning.border": "#3d444db3", "players": [ { - "background": "#001a47ff", - "border": "#001a47ff" + "cursor": "#0576ffff", + "background": "#0576ffff", + "selection": "#0576ff66" }, { - "background": "#311708ff", - "border": "#311708ff" + "cursor": "#984b10ff", + "background": "#984b10ff", + "selection": "#984b1066" }, { - "background": "#2d1524ff", - "border": "#2d1524ff" + "cursor": "#d34591ff", + "background": "#d34591ff", + "selection": "#d3459166" }, { - "background": "#122117ff", - "border": "#122117ff" + "cursor": "#2f6f37ff", + "background": "#2f6f37ff", + "selection": "#2f6f3766" }, { - "background": "#211047ff", - "border": "#211047ff" + "cursor": "#975bf1ff", + "background": "#975bf1ff", + "selection": "#975bf166" }, { - "background": "#2e1a00ff", - "border": "#2e1a00ff" + "cursor": "#895906ff", + "background": "#895906ff", + "selection": "#89590666" }, { - "background": "#041f25ff", - "border": "#041f25ff" + "cursor": "#106c70ff", + "background": "#106c70ff", + "selection": "#106c7066" }, { - "background": "#3c0614ff", - "border": "#3c0614ff" + "cursor": "#eb3342ff", + "background": "#eb3342ff", + "selection": "#eb334266" } ], "syntax": { @@ -2191,8 +2233,8 @@ }, "string.escape": { "color": "#7ee787ff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#a5d6ffff", @@ -2248,7 +2290,6 @@ } }, { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "dark", "name": "Github Dark High Contrast", "style": { @@ -2273,8 +2314,8 @@ "editor.active_line_number": "#ffffffff", "editor.active_wrap_guide": "#b7bdc8ff", "editor.background": "#010409ff", - "editor.document_highlight.read_background": "#5cacff1a", - "editor.document_highlight.write_background": "#194fb1ff", + "editor.document_highlight.read_background": "#74b9ff4d", + "editor.document_highlight.write_background": "#74b9ff33", "editor.foreground": "#ffffffff", "editor.gutter.background": "#010409ff", "editor.highlighted_line.background": "#212830ff", @@ -2330,7 +2371,7 @@ "scrollbar.thumb.hover_background": "#151b23ff", "scrollbar.track.background": "#00000000", "scrollbar.track.border": "#00000000", - "search.match_background": "#edaa2726", + "search.match_background": "#fbd6694d", "status_bar.background": "#010409ff", "success": "#2bd853ff", "success.background": "#0ac74026", @@ -2381,36 +2422,44 @@ "warning.border": "#b7bdc8ff", "players": [ { - "background": "#001a47ff", - "border": "#001a47ff" + "cursor": "#0576ffff", + "background": "#0576ffff", + "selection": "#0576ff66" }, { - "background": "#311708ff", - "border": "#311708ff" + "cursor": "#984b10ff", + "background": "#984b10ff", + "selection": "#984b1066" }, { - "background": "#2d1524ff", - "border": "#2d1524ff" + "cursor": "#d34591ff", + "background": "#d34591ff", + "selection": "#d3459166" }, { - "background": "#122117ff", - "border": "#122117ff" + "cursor": "#2f6f37ff", + "background": "#2f6f37ff", + "selection": "#2f6f3766" }, { - "background": "#211047ff", - "border": "#211047ff" + "cursor": "#975bf1ff", + "background": "#975bf1ff", + "selection": "#975bf166" }, { - "background": "#2e1a00ff", - "border": "#2e1a00ff" + "cursor": "#895906ff", + "background": "#895906ff", + "selection": "#89590666" }, { - "background": "#041f25ff", - "border": "#041f25ff" + "cursor": "#106c70ff", + "background": "#106c70ff", + "selection": "#106c7066" }, { - "background": "#3c0614ff", - "border": "#3c0614ff" + "cursor": "#eb3342ff", + "background": "#eb3342ff", + "selection": "#eb334266" } ], "syntax": { @@ -2565,8 +2614,8 @@ }, "string.escape": { "color": "#72f088ff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#addcffff", @@ -2622,7 +2671,6 @@ } }, { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "dark", "name": "Github Dark Tritanopia", "style": { @@ -2647,8 +2695,8 @@ "editor.active_line_number": "#f0f6fcff", "editor.active_wrap_guide": "#3d444db3", "editor.background": "#0d1117ff", - "editor.document_highlight.read_background": "#388bfd1a", - "editor.document_highlight.write_background": "#1f6febff", + "editor.document_highlight.read_background": "#4493f84d", + "editor.document_highlight.write_background": "#4493f833", "editor.foreground": "#f0f6fcff", "editor.gutter.background": "#0d1117ff", "editor.highlighted_line.background": "#656c7633", @@ -2704,7 +2752,7 @@ "scrollbar.thumb.hover_background": "#151b23ff", "scrollbar.track.background": "#00000000", "scrollbar.track.border": "#00000000", - "search.match_background": "#bb800926", + "search.match_background": "#f2cc604d", "status_bar.background": "#010409ff", "success": "#58a6ffff", "success.background": "#388bfd26", @@ -2755,36 +2803,44 @@ "warning.border": "#3d444db3", "players": [ { - "background": "#001a47ff", - "border": "#001a47ff" + "cursor": "#0576ffff", + "background": "#0576ffff", + "selection": "#0576ff66" }, { - "background": "#311708ff", - "border": "#311708ff" + "cursor": "#984b10ff", + "background": "#984b10ff", + "selection": "#984b1066" }, { - "background": "#2d1524ff", - "border": "#2d1524ff" + "cursor": "#d34591ff", + "background": "#d34591ff", + "selection": "#d3459166" }, { - "background": "#122117ff", - "border": "#122117ff" + "cursor": "#2f6f37ff", + "background": "#2f6f37ff", + "selection": "#2f6f3766" }, { - "background": "#211047ff", - "border": "#211047ff" + "cursor": "#975bf1ff", + "background": "#975bf1ff", + "selection": "#975bf166" }, { - "background": "#2e1a00ff", - "border": "#2e1a00ff" + "cursor": "#895906ff", + "background": "#895906ff", + "selection": "#89590666" }, { - "background": "#041f25ff", - "border": "#041f25ff" + "cursor": "#106c70ff", + "background": "#106c70ff", + "selection": "#106c7066" }, { - "background": "#3c0614ff", - "border": "#3c0614ff" + "cursor": "#eb3342ff", + "background": "#eb3342ff", + "selection": "#eb334266" } ], "syntax": { @@ -2939,8 +2995,8 @@ }, "string.escape": { "color": "#7ee787ff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#a5d6ffff", @@ -2996,7 +3052,6 @@ } }, { - "$schema": "https://zed.dev/schema/themes/v0.1.0.json", "appearance": "dark", "name": "Github Dark Dimmed", "style": { @@ -3021,8 +3076,8 @@ "editor.active_line_number": "#d1d7e0ff", "editor.active_wrap_guide": "#3d444db3", "editor.background": "#212830ff", - "editor.document_highlight.read_background": "#4184e41a", - "editor.document_highlight.write_background": "#316dcaff", + "editor.document_highlight.read_background": "#478be64d", + "editor.document_highlight.write_background": "#478be633", "editor.foreground": "#d1d7e0ff", "editor.gutter.background": "#212830ff", "editor.highlighted_line.background": "#656c7633", @@ -3078,7 +3133,7 @@ "scrollbar.thumb.hover_background": "#262c36ff", "scrollbar.track.background": "#00000000", "scrollbar.track.border": "#00000000", - "search.match_background": "#ae7c1426", + "search.match_background": "#eac55f4d", "status_bar.background": "#151b23ff", "success": "#57ab5aff", "success.background": "#46954a26", @@ -3129,36 +3184,44 @@ "warning.border": "#3d444db3", "players": [ { - "background": "#001a47ff", - "border": "#001a47ff" + "cursor": "#0576ffff", + "background": "#0576ffff", + "selection": "#0576ff66" }, { - "background": "#311708ff", - "border": "#311708ff" + "cursor": "#984b10ff", + "background": "#984b10ff", + "selection": "#984b1066" }, { - "background": "#2d1524ff", - "border": "#2d1524ff" + "cursor": "#d34591ff", + "background": "#d34591ff", + "selection": "#d3459166" }, { - "background": "#122117ff", - "border": "#122117ff" + "cursor": "#2f6f37ff", + "background": "#2f6f37ff", + "selection": "#2f6f3766" }, { - "background": "#211047ff", - "border": "#211047ff" + "cursor": "#975bf1ff", + "background": "#975bf1ff", + "selection": "#975bf166" }, { - "background": "#2e1a00ff", - "border": "#2e1a00ff" + "cursor": "#895906ff", + "background": "#895906ff", + "selection": "#89590666" }, { - "background": "#041f25ff", - "border": "#041f25ff" + "cursor": "#106c70ff", + "background": "#106c70ff", + "selection": "#106c7066" }, { - "background": "#3c0614ff", - "border": "#3c0614ff" + "cursor": "#eb3342ff", + "background": "#eb3342ff", + "selection": "#eb334266" } ], "syntax": { @@ -3313,8 +3376,8 @@ }, "string.escape": { "color": "#8ddb8cff", - "font_style": "bold", - "font_weight": null + "font_style": null, + "font_weight": 700 }, "string.regex": { "color": "#96d0ffff", From 2c945080183c40df4ec03c606cf66855ca81ecff Mon Sep 17 00:00:00 2001 From: Clay Tercek <30105080+claytercek@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:57:05 -0400 Subject: [PATCH 5/5] update version number --- extension.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension.toml b/extension.toml index 1b3df4e..bac6998 100644 --- a/extension.toml +++ b/extension.toml @@ -1,6 +1,6 @@ id = "github-theme" name = "Github Theme" -version = "0.1.0" +version = "0.1.1" schema_version = 1 authors = ["Pyae Sone Aung ", "Clay Tercek"] description = "GitHub themes for Zed"