Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Light & Dark themes

Browse source
This commit is contained in:
Nate Butler 2022-04-06 01:46:10 -04:00
parent 2a2c4071f4
commit e201826d00
7 changed files with 119 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/zed/assets/themes/dark.json
View file

@ -51,7 +51,7 @@
"empty": { "empty": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#808080", "color": "#474747",
"size": 14 "size": 14
}, },
"padding": { "padding": {
@ -272,7 +272,7 @@
} }
}, },
"hovered_sign_in_prompt": { "hovered_sign_in_prompt": {
"family": "Zed Mono", "family": "Zed Sans",
"color": "#ffffff", "color": "#ffffff",
"size": 13, "size": 13,
"underline": true, "underline": true,
@ -327,17 +327,17 @@
"editor": { "editor": {
"text_color": "#d5d5d5", "text_color": "#d5d5d5",
"background": "#000000", "background": "#000000",
"active_line_background": "#0e0e0e", "active_line_background": "#ffffff12",
"code_actions_indicator": "#9c9c9c", "code_actions_indicator": "#555555",
"diff_background_deleted": "#f15656", "diff_background_deleted": "#f15656",
"diff_background_inserted": "#1b9447", "diff_background_inserted": "#1b9447",
"document_highlight_read_background": "#14a89829", "document_highlight_read_background": "#ffffff1f",
"document_highlight_write_background": "#14a89852", "document_highlight_write_background": "#ffffff29",
"error_color": "#f15656", "error_color": "#f15656",
"gutter_background": "#000000", "gutter_background": "#000000",
"gutter_padding_factor": 3.5, "gutter_padding_factor": 3.5,
"highlighted_line_background": "#070707", "highlighted_line_background": "#ffffff1f",
"line_number": "#808080", "line_number": "#474747",
"line_number_active": "#ffffff", "line_number_active": "#ffffff",
"rename_fade": 0.6, "rename_fade": 0.6,
"unnecessary_code_fade": 0.5, "unnecessary_code_fade": 0.5,
@ -400,14 +400,15 @@
"right": 6, "right": 6,
"top": 2 "top": 2
}, },
"background": "#070707" "background": "#ffffff14"
}, },
"margin": { "margin": {
"left": -14 "left": -14
}, },
"match_highlight": { "match_highlight": {
"color": "#4f8ff7", "family": "Zed Mono",
"weight": "normal" "color": "#1096d3",
"size": 14
}, },
"selected_item": { "selected_item": {
"corner_radius": 6, "corner_radius": 6,
@ -417,7 +418,7 @@
"right": 6, "right": 6,
"top": 2 "top": 2
}, },
"background": "#0e0e0e" "background": "#ffffff1f"
} }
}, },
"diagnostic_header": { "diagnostic_header": {
@ -453,7 +454,7 @@
} }
}, },
"diagnostic_path_header": { "diagnostic_path_header": {
"background": "#0e0e0e", "background": "#ffffff12",
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"filename": { "filename": {
"family": "Zed Mono", "family": "Zed Mono",

141
crates/zed/assets/themes/light.json
View file

@ -1,6 +1,6 @@
{ {
"selector": { "selector": {
"background": "#f1f1f1", "background": "#f8f8f8",
"corner_radius": 6, "corner_radius": 6,
"padding": 8, "padding": 8,
"item": { "item": {
@ -42,16 +42,16 @@
"weight": "bold", "weight": "bold",
"size": 14 "size": 14
}, },
"background": "#d5d5d5" "background": "#dcdcdc"
}, },
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"empty": { "empty": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#636363", "color": "#808080",
"size": 14 "size": 14
}, },
"padding": { "padding": {
@ -79,7 +79,7 @@
"size": 14 "size": 14
}, },
"border": { "border": {
"color": "#e3e3e3", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"padding": { "padding": {
@ -103,13 +103,13 @@
} }
}, },
"workspace": { "workspace": {
"background": "#f1f1f1", "background": "#f8f8f8",
"leader_border_opacity": 0.7, "leader_border_opacity": 0.7,
"leader_border_width": 2, "leader_border_width": 2,
"tab": { "tab": {
"height": 32, "height": 32,
"background": "#f1f1f1", "background": "#f8f8f8",
"icon_close": "#717171", "icon_close": "#9c9c9c",
"icon_close_active": "#000000", "icon_close_active": "#000000",
"icon_conflict": "#f7bf17", "icon_conflict": "#f7bf17",
"icon_dirty": "#135acd", "icon_dirty": "#135acd",
@ -121,7 +121,7 @@
"size": 14 "size": 14
}, },
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"left": true, "left": true,
"bottom": true, "bottom": true,
@ -135,7 +135,7 @@
"active_tab": { "active_tab": {
"height": 32, "height": 32,
"background": "#ffffff", "background": "#ffffff",
"icon_close": "#717171", "icon_close": "#9c9c9c",
"icon_close_active": "#000000", "icon_close_active": "#000000",
"icon_conflict": "#f7bf17", "icon_conflict": "#f7bf17",
"icon_dirty": "#135acd", "icon_dirty": "#135acd",
@ -147,7 +147,7 @@
"size": 14 "size": 14
}, },
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"left": true, "left": true,
"bottom": false, "bottom": false,
@ -160,15 +160,15 @@
}, },
"left_sidebar": { "left_sidebar": {
"width": 30, "width": 30,
"background": "#f1f1f1", "background": "#f8f8f8",
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"right": true "right": true
}, },
"item": { "item": {
"height": 32, "height": 32,
"icon_color": "#555555", "icon_color": "#717171",
"icon_size": 18 "icon_size": 18
}, },
"active_item": { "active_item": {
@ -177,7 +177,7 @@
"icon_size": 18 "icon_size": 18
}, },
"resize_handle": { "resize_handle": {
"background": "#c6c6c6", "background": "#d5d5d5",
"padding": { "padding": {
"left": 1 "left": 1
} }
@ -185,15 +185,15 @@
}, },
"right_sidebar": { "right_sidebar": {
"width": 30, "width": 30,
"background": "#f1f1f1", "background": "#f8f8f8",
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"left": true "left": true
}, },
"item": { "item": {
"height": 32, "height": 32,
"icon_color": "#555555", "icon_color": "#717171",
"icon_size": 18 "icon_size": 18
}, },
"active_item": { "active_item": {
@ -202,14 +202,14 @@
"icon_size": 18 "icon_size": 18
}, },
"resize_handle": { "resize_handle": {
"background": "#c6c6c6", "background": "#d5d5d5",
"padding": { "padding": {
"left": 1 "left": 1
} }
} }
}, },
"pane_divider": { "pane_divider": {
"color": "#e3e3e3", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"status_bar": { "status_bar": {
@ -238,8 +238,8 @@
"titlebar": { "titlebar": {
"avatar_width": 18, "avatar_width": 18,
"height": 32, "height": 32,
"background": "#e3e3e3", "background": "#eaeaea",
"share_icon_color": "#555555", "share_icon_color": "#717171",
"share_icon_active_color": "#484bed", "share_icon_active_color": "#484bed",
"title": { "title": {
"family": "Zed Sans", "family": "Zed Sans",
@ -258,7 +258,7 @@
"width": 12 "width": 12
}, },
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"bottom": true "bottom": true
}, },
@ -272,7 +272,7 @@
} }
}, },
"hovered_sign_in_prompt": { "hovered_sign_in_prompt": {
"family": "Zed Mono", "family": "Zed Sans",
"color": "#000000", "color": "#000000",
"size": 13, "size": 13,
"underline": true, "underline": true,
@ -281,7 +281,7 @@
} }
}, },
"offline_icon": { "offline_icon": {
"color": "#555555", "color": "#717171",
"width": 16, "width": 16,
"padding": { "padding": {
"right": 4 "right": 4
@ -297,7 +297,7 @@
"height": 34, "height": 34,
"background": "#ffffff", "background": "#ffffff",
"border": { "border": {
"color": "#e3e3e3", "color": "#d5d5d5",
"width": 1, "width": 1,
"bottom": true "bottom": true
}, },
@ -327,16 +327,16 @@
"editor": { "editor": {
"text_color": "#1c1c1c", "text_color": "#1c1c1c",
"background": "#ffffff", "background": "#ffffff",
"active_line_background": "#f1f1f1", "active_line_background": "#0000000f",
"code_actions_indicator": "#555555", "code_actions_indicator": "#9c9c9c",
"diff_background_deleted": "#fcc6c6", "diff_background_deleted": "#fcc6c6",
"diff_background_inserted": "#b7f9ce", "diff_background_inserted": "#b7f9ce",
"document_highlight_read_background": "#de900c0f", "document_highlight_read_background": "#0000000f",
"document_highlight_write_background": "#de900c42", "document_highlight_write_background": "#00000029",
"error_color": "#eb2d2d", "error_color": "#eb2d2d",
"gutter_background": "#ffffff", "gutter_background": "#ffffff",
"gutter_padding_factor": 3.5, "gutter_padding_factor": 3.5,
"highlighted_line_background": "#f1f1f1", "highlighted_line_background": "#0000001f",
"line_number": "#aaaaaa", "line_number": "#aaaaaa",
"line_number_active": "#000000", "line_number_active": "#000000",
"rename_fade": 0.6, "rename_fade": 0.6,
@ -380,7 +380,7 @@
"corner_radius": 6, "corner_radius": 6,
"padding": 6, "padding": 6,
"border": { "border": {
"color": "#e3e3e3", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"item": { "item": {
@ -400,14 +400,15 @@
"right": 6, "right": 6,
"top": 2 "top": 2
}, },
"background": "#f8f8f8" "background": "#00000008"
}, },
"margin": { "margin": {
"left": -14 "left": -14
}, },
"match_highlight": { "match_highlight": {
"color": "#1819a1", "family": "Zed Mono",
"weight": "normal" "color": "#484bed",
"size": 14
}, },
"selected_item": { "selected_item": {
"corner_radius": 6, "corner_radius": 6,
@ -417,15 +418,15 @@
"right": 6, "right": 6,
"top": 2 "top": 2
}, },
"background": "#f1f1f1" "background": "#0000000f"
} }
}, },
"diagnostic_header": { "diagnostic_header": {
"background": "#f1f1f1", "background": "#f8f8f8",
"icon_width_factor": 1.5, "icon_width_factor": 1.5,
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"border": { "border": {
"color": "#e3e3e3", "color": "#d5d5d5",
"width": 1, "width": 1,
"bottom": true, "bottom": true,
"top": true "top": true
@ -453,7 +454,7 @@
} }
}, },
"diagnostic_path_header": { "diagnostic_path_header": {
"background": "#f1f1f1", "background": "#0000000f",
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"filename": { "filename": {
"family": "Zed Mono", "family": "Zed Mono",
@ -473,7 +474,7 @@
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"header": { "header": {
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"top": true "top": true
} }
@ -496,7 +497,7 @@
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"header": { "header": {
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"top": true "top": true
} }
@ -519,7 +520,7 @@
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"header": { "header": {
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"top": true "top": true
} }
@ -542,7 +543,7 @@
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"header": { "header": {
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"top": true "top": true
} }
@ -565,7 +566,7 @@
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"header": { "header": {
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"top": true "top": true
} }
@ -588,7 +589,7 @@
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"header": { "header": {
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"top": true "top": true
} }
@ -611,7 +612,7 @@
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"header": { "header": {
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"top": true "top": true
} }
@ -634,7 +635,7 @@
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"header": { "header": {
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1, "width": 1,
"top": true "top": true
} }
@ -708,7 +709,7 @@
}, },
"entry": { "entry": {
"height": 22, "height": 22,
"icon_color": "#717171", "icon_color": "#9c9c9c",
"icon_size": 8, "icon_size": 8,
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
@ -719,8 +720,8 @@
}, },
"hovered_entry": { "hovered_entry": {
"height": 22, "height": 22,
"background": "#e3e3e3", "background": "#eaeaea",
"icon_color": "#717171", "icon_color": "#9c9c9c",
"icon_size": 8, "icon_size": 8,
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
@ -731,7 +732,7 @@
}, },
"selected_entry": { "selected_entry": {
"height": 22, "height": 22,
"icon_color": "#717171", "icon_color": "#9c9c9c",
"icon_size": 8, "icon_size": 8,
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
@ -742,8 +743,8 @@
}, },
"hovered_selected_entry": { "hovered_selected_entry": {
"height": 22, "height": 22,
"background": "#e3e3e3", "background": "#eaeaea",
"icon_color": "#717171", "icon_color": "#9c9c9c",
"icon_size": 8, "icon_size": 8,
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
@ -827,7 +828,7 @@
"right": 8 "right": 8
} }
}, },
"background": "#e3e3e3", "background": "#eaeaea",
"corner_radius": 6 "corner_radius": 6
}, },
"active_item": { "active_item": {
@ -862,7 +863,7 @@
"right": 8 "right": 8
} }
}, },
"background": "#e3e3e3", "background": "#eaeaea",
"corner_radius": 6 "corner_radius": 6
}, },
"menu": { "menu": {
@ -870,7 +871,7 @@
"corner_radius": 6, "corner_radius": 6,
"padding": 4, "padding": 4,
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"shadow": { "shadow": {
@ -961,7 +962,7 @@
"selection": "#2472f23d" "selection": "#2472f23d"
}, },
"border": { "border": {
"color": "#e3e3e3", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"padding": { "padding": {
@ -980,7 +981,7 @@
"right": 12 "right": 12
}, },
"host_row_height": 28, "host_row_height": 28,
"tree_branch_color": "#f1f1f1", "tree_branch_color": "#e3e3e3",
"tree_branch_width": 1, "tree_branch_width": 1,
"host_avatar": { "host_avatar": {
"corner_radius": 10, "corner_radius": 10,
@ -1031,7 +1032,7 @@
"padding": { "padding": {
"left": 8 "left": 8
}, },
"background": "#f1f1f1", "background": "#f8f8f8",
"corner_radius": 6 "corner_radius": 6
}, },
"hovered_shared_project": { "hovered_shared_project": {
@ -1052,7 +1053,7 @@
"padding": { "padding": {
"left": 8 "left": 8
}, },
"background": "#e3e3e3", "background": "#eaeaea",
"corner_radius": 6 "corner_radius": 6
}, },
"unshared_project": { "unshared_project": {
@ -1096,17 +1097,17 @@
} }
}, },
"search": { "search": {
"match_background": "#993bf31f", "match_background": "#eb2d2d33",
"tab_icon_spacing": 4, "tab_icon_spacing": 4,
"tab_icon_width": 14, "tab_icon_width": 14,
"active_hovered_option_button": { "active_hovered_option_button": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#474747", "color": "#474747",
"size": 14, "size": 14,
"background": "#e3e3e3", "background": "#eaeaea",
"corner_radius": 6, "corner_radius": 6,
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"margin": { "margin": {
@ -1124,10 +1125,10 @@
"family": "Zed Mono", "family": "Zed Mono",
"color": "#474747", "color": "#474747",
"size": 14, "size": 14,
"background": "#e3e3e3", "background": "#eaeaea",
"corner_radius": 6, "corner_radius": 6,
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"margin": { "margin": {
@ -1161,7 +1162,7 @@
"size": 14 "size": 14
}, },
"border": { "border": {
"color": "#e3e3e3", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"margin": { "margin": {
@ -1178,10 +1179,10 @@
"family": "Zed Mono", "family": "Zed Mono",
"color": "#474747", "color": "#474747",
"size": 14, "size": 14,
"background": "#e3e3e3", "background": "#eaeaea",
"corner_radius": 6, "corner_radius": 6,
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"margin": { "margin": {
@ -1238,10 +1239,10 @@
"family": "Zed Mono", "family": "Zed Mono",
"color": "#474747", "color": "#474747",
"size": 14, "size": 14,
"background": "#f1f1f1", "background": "#f8f8f8",
"corner_radius": 6, "corner_radius": 6,
"border": { "border": {
"color": "#c6c6c6", "color": "#d5d5d5",
"width": 1 "width": 1
}, },
"margin": { "margin": {

7
styles/src/styleTree/editor.ts
View file

@ -42,7 +42,7 @@ export default function editor(theme: Theme) {
textColor: theme.syntax.primary.color.value, textColor: theme.syntax.primary.color.value,
background: backgroundColor(theme, 500), background: backgroundColor(theme, 500),
activeLineBackground: theme.editor.line.active.value, activeLineBackground: theme.editor.line.active.value,
codeActionsIndicator: iconColor(theme, "secondary"), codeActionsIndicator: iconColor(theme, "muted"),
diffBackgroundDeleted: backgroundColor(theme, "error"), diffBackgroundDeleted: backgroundColor(theme, "error"),
diffBackgroundInserted: backgroundColor(theme, "ok"), diffBackgroundInserted: backgroundColor(theme, "ok"),
documentHighlightReadBackground: theme.editor.highlight.occurrence.value, documentHighlightReadBackground: theme.editor.highlight.occurrence.value,
@ -78,10 +78,7 @@ export default function editor(theme: Theme) {
margin: { margin: {
left: -14, left: -14,
}, },
matchHighlight: { matchHighlight: text(theme, "mono", "feature"),
color: theme.syntax.keyword.color.value,
weight: theme.syntax.keyword.weight.value,
},
selectedItem: { selectedItem: {
...autocompleteItem, ...autocompleteItem,
background: backgroundColor(theme, 500, "active"), background: backgroundColor(theme, 500, "active"),

2
styles/src/styleTree/selectorModal.ts
View file

@ -28,7 +28,7 @@ export default function selectorModal(theme: Theme): Object {
activeItem, activeItem,
border: border(theme, "primary"), border: border(theme, "primary"),
empty: { empty: {
text: text(theme, "sans", "muted"), text: text(theme, "sans", "placeholder"),
padding: { padding: {
bottom: 4, bottom: 4,
left: 16, left: 16,

2
styles/src/styleTree/workspace.ts
View file

@ -117,7 +117,7 @@ export default function workspace(theme: Theme) {
signInPrompt, signInPrompt,
hoveredSignInPrompt: { hoveredSignInPrompt: {
...signInPrompt, ...signInPrompt,
...text(theme, "mono", "active"), ...text(theme, "sans", "active"),
size: 13, size: 13,
}, },
offlineIcon: { offlineIcon: {

18
styles/src/themes/dark.ts
View file

@ -6,19 +6,19 @@ const backgroundColor = {
100: { 100: {
base: colors.neutral[750], base: colors.neutral[750],
hovered: colors.neutral[725], hovered: colors.neutral[725],
active: colors.neutral[700], active: colors.neutral[800],
focused: colors.neutral[675], focused: colors.neutral[675],
}, },
300: { 300: {
base: colors.neutral[800], base: colors.neutral[800],
hovered: colors.neutral[775], hovered: colors.neutral[775],
active: colors.neutral[750], active: colors.neutral[750],
focused: colors.neutral[725], focused: colors.neutral[775],
}, },
500: { 500: {
base: colors.neutral[900], base: colors.neutral[900],
hovered: colors.neutral[875], hovered: withOpacity(colors.neutral[0], 0.08),
active: colors.neutral[850], active: withOpacity(colors.neutral[0], 0.12),
focused: colors.neutral[825], focused: colors.neutral[825],
}, },
ok: { ok: {
@ -103,23 +103,23 @@ const editor = {
indent_guide: borderColor.muted, indent_guide: borderColor.muted,
indent_guide_active: borderColor.secondary, indent_guide_active: borderColor.secondary,
line: { line: {
active: backgroundColor[500].active, active: withOpacity(colors.neutral[0], 0.07),
highlighted: backgroundColor[500].hovered, highlighted: withOpacity(colors.neutral[0], 0.12),
inserted: backgroundColor.ok.active, inserted: backgroundColor.ok.active,
deleted: backgroundColor.error.active, deleted: backgroundColor.error.active,
modified: backgroundColor.info.active, modified: backgroundColor.info.active,
}, },
highlight: { highlight: {
selection: player[1].selectionColor, selection: player[1].selectionColor,
occurrence: withOpacity(colors.teal[500], 0.16), occurrence: withOpacity(colors.neutral[0], 0.12),
activeOccurrence: withOpacity(colors.teal[500], 0.32), activeOccurrence: withOpacity(colors.neutral[0], 0.16), // TODO: This is not correctly hooked up to occurences on the rust side
matchingBracket: backgroundColor[500].active, matchingBracket: backgroundColor[500].active,
match: withOpacity(colors.sky[500], 0.16), match: withOpacity(colors.sky[500], 0.16),
activeMatch: withOpacity(colors.sky[800], 0.32), activeMatch: withOpacity(colors.sky[800], 0.32),
related: backgroundColor[500].focused, related: backgroundColor[500].focused,
}, },
gutter: { gutter: {
primary: textColor.muted, primary: textColor.placeholder,
active: textColor.active, active: textColor.active,
}, },
}; };

42
styles/src/themes/light.ts
View file

@ -4,22 +4,22 @@ import Theme, { buildPlayer, Syntax } from "./theme";
const backgroundColor = { const backgroundColor = {
100: { 100: {
base: colors.neutral[100], base: colors.neutral[75],
hovered: colors.neutral[150],
active: colors.neutral[200],
focused: colors.neutral[150],
},
300: {
base: colors.neutral[50],
hovered: colors.neutral[100], hovered: colors.neutral[100],
active: colors.neutral[150], active: colors.neutral[150],
focused: colors.neutral[100], focused: colors.neutral[100],
}, },
300: {
base: colors.neutral[25],
hovered: colors.neutral[75],
active: colors.neutral[125],
focused: colors.neutral[75],
},
500: { 500: {
base: colors.neutral[0], base: colors.neutral[0],
hovered: colors.neutral[25], hovered: withOpacity(colors.neutral[900], 0.03),
active: colors.neutral[50], active: withOpacity(colors.neutral[900], 0.06),
focused: colors.neutral[75], focused: colors.neutral[50],
}, },
ok: { ok: {
base: colors.green[100], base: colors.green[100],
@ -48,9 +48,9 @@ const backgroundColor = {
}; };
const borderColor = { const borderColor = {
primary: colors.neutral[200], primary: colors.neutral[150],
secondary: colors.neutral[100], secondary: colors.neutral[150],
muted: colors.neutral[50], muted: colors.neutral[100],
focused: colors.neutral[100], focused: colors.neutral[100],
active: colors.neutral[250], active: colors.neutral[250],
ok: colors.green[200], ok: colors.green[200],
@ -74,8 +74,8 @@ const textColor = {
const iconColor = { const iconColor = {
primary: colors.neutral[700], primary: colors.neutral[700],
secondary: colors.neutral[600], secondary: colors.neutral[500],
muted: colors.neutral[500], muted: colors.neutral[350],
placeholder: colors.neutral[300], placeholder: colors.neutral[300],
active: colors.neutral[900], active: colors.neutral[900],
feature: colors.indigo[500], feature: colors.indigo[500],
@ -102,19 +102,19 @@ const editor = {
indent_guide: borderColor.muted, indent_guide: borderColor.muted,
indent_guide_active: borderColor.secondary, indent_guide_active: borderColor.secondary,
line: { line: {
active: backgroundColor[500].active, active: withOpacity(colors.neutral[900], 0.06),
highlighted: backgroundColor[500].active, highlighted: withOpacity(colors.neutral[900], 0.12),
inserted: backgroundColor.ok.active, inserted: backgroundColor.ok.active,
deleted: backgroundColor.error.active, deleted: backgroundColor.error.active,
modified: backgroundColor.info.active, modified: backgroundColor.info.active,
}, },
highlight: { highlight: {
selection: player[1].selectionColor, selection: player[1].selectionColor,
occurrence: withOpacity(colors.amber[500], 0.06), occurrence: withOpacity(colors.neutral[900], 0.06),
activeOccurrence: withOpacity(colors.amber[500], 0.26), activeOccurrence: withOpacity(colors.neutral[900], 0.16), // TODO: This is not correctly hooked up to occurences on the rust side
matchingBracket: colors.neutral[0], matchingBracket: colors.neutral[0],
match: withOpacity(colors.purple[500], 0.12), match: withOpacity(colors.red[500], 0.2),
activeMatch: withOpacity(colors.purple[400], 0.36), activeMatch: withOpacity(colors.indigo[400], 0.36),
related: colors.neutral[0], related: colors.neutral[0],
}, },
gutter: { gutter: {