This commit is contained in:
Nate Butler 2022-04-02 01:05:28 -04:00 committed by Keith Simmons
parent bfde9dca4e
commit c374fd2f54
7 changed files with 252 additions and 254 deletions

View file

@ -18,7 +18,7 @@
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#90df17", "color": "#72ad19",
"weight": "bold", "weight": "bold",
"size": 14 "size": 14
} }
@ -33,16 +33,16 @@
"corner_radius": 6, "corner_radius": 6,
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#90df17", "color": "#72ad19",
"weight": "bold", "weight": "bold",
"size": 14 "size": 14
}, },
"background": "#000000" "background": "#1c1c1c"
}, },
"border": { "border": {
"color": "#0e0e0e", "color": "#0e0e0e",
@ -70,12 +70,12 @@
"size": 14 "size": 14
}, },
"selection": { "selection": {
"cursor": "#4287f6", "cursor": "#195cc8",
"selection": "#4287f6" "selection": "#307af3"
}, },
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 16 "size": 16
}, },
"border": { "border": {
@ -111,8 +111,8 @@
"background": "#1c1c1c", "background": "#1c1c1c",
"icon_close": "#717171", "icon_close": "#717171",
"icon_close_active": "#f1f1f1", "icon_close_active": "#f1f1f1",
"icon_conflict": "#f7b241", "icon_conflict": "#c38214",
"icon_dirty": "#4287f6", "icon_dirty": "#195cc8",
"icon_width": 8, "icon_width": 8,
"spacing": 10, "spacing": 10,
"text": { "text": {
@ -137,8 +137,8 @@
"background": "#000000", "background": "#000000",
"icon_close": "#717171", "icon_close": "#717171",
"icon_close_active": "#f1f1f1", "icon_close_active": "#f1f1f1",
"icon_conflict": "#f7b241", "icon_conflict": "#c38214",
"icon_dirty": "#4287f6", "icon_dirty": "#195cc8",
"icon_width": 8, "icon_width": 8,
"spacing": 10, "spacing": 10,
"text": { "text": {
@ -243,7 +243,7 @@
"share_icon_active_color": "#f1f1f1", "share_icon_active_color": "#f1f1f1",
"title": { "title": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
}, },
"avatar": { "avatar": {
@ -289,7 +289,7 @@
}, },
"outdated_warning": { "outdated_warning": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#f8c570", "color": "#cc8712",
"size": 13 "size": 13
} }
}, },
@ -325,54 +325,54 @@
} }
}, },
"editor": { "editor": {
"text_color": "#9c9c9c", "text_color": "#e3e3e3",
"background": "#000000", "background": "#000000",
"active_line_background": "#ffffff", "active_line_background": "#1c1c1c",
"code_actions_indicator": "#717171", "code_actions_indicator": "#717171",
"diff_background_deleted": "#f78c8c", "diff_background_deleted": "#d71c1c",
"diff_background_inserted": "#22c55e", "diff_background_inserted": "#1ea34f",
"document_highlight_read_background": "#000000", "document_highlight_read_background": "#1e22db",
"document_highlight_write_background": "#000000", "document_highlight_write_background": "#1e22db",
"error_color": "#f78c8c", "error_color": "#d71c1c",
"gutter_background": "#000000", "gutter_background": "#000000",
"gutter_padding_factor": 2.5, "gutter_padding_factor": 2.5,
"highlighted_line_background": "#ffffff", "highlighted_line_background": "#0e0e0e",
"line_number": "#ffffff", "line_number": "#636363",
"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,
"selection": { "selection": {
"cursor": "#4287f6", "cursor": "#195cc8",
"selection": "#4287f6" "selection": "#307af3"
}, },
"guest_selections": [ "guest_selections": [
{ {
"cursor": "#777af4", "cursor": "#70a919",
"selection": "#777af4" "selection": "#80c517"
}, },
{ {
"cursor": "#23d464", "cursor": "#1e22db",
"selection": "#23d464" "selection": "#5558ee"
}, },
{ {
"cursor": "#f98a3d", "cursor": "#c45c14",
"selection": "#f98a3d" "selection": "#f66e0f"
}, },
{ {
"cursor": "#b671f8", "cursor": "#7d19dc",
"selection": "#b671f8" "selection": "#a048f4"
}, },
{ {
"cursor": "#16ddc7", "cursor": "#17a293",
"selection": "#16ddc7" "selection": "#15b3a2"
}, },
{ {
"cursor": "#f58ac0", "cursor": "#d51e79",
"selection": "#f58ac0" "selection": "#e93d92"
}, },
{ {
"cursor": "#f6bc09", "cursor": "#bc9212",
"selection": "#f6bc09" "selection": "#e0ac0b"
} }
], ],
"autocomplete": { "autocomplete": {
@ -400,13 +400,13 @@
"right": 6, "right": 6,
"top": 2 "top": 2
}, },
"background": "#000000" "background": "#0e0e0e"
}, },
"margin": { "margin": {
"left": -14 "left": -14
}, },
"match_highlight": { "match_highlight": {
"color": "#59c3f5", "color": "#1588bc",
"weight": "normal" "weight": "normal"
}, },
"selected_item": { "selected_item": {
@ -417,7 +417,7 @@
"right": 6, "right": 6,
"top": 2 "top": 2
}, },
"background": "#000000" "background": "#1c1c1c"
} }
}, },
"diagnostic_header": { "diagnostic_header": {
@ -441,7 +441,7 @@
"message": { "message": {
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
}, },
@ -453,11 +453,11 @@
} }
}, },
"diagnostic_path_header": { "diagnostic_path_header": {
"background": "#ffffff", "background": "#1c1c1c",
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"filename": { "filename": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
}, },
"path": { "path": {
@ -481,12 +481,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#f78c8c", "color": "#d71c1c",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#f78c8c", "color": "#d71c1c",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -504,12 +504,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#f8c570", "color": "#cc8712",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#f8c570", "color": "#cc8712",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -527,12 +527,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#6099f7", "color": "#185fd0",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#6099f7", "color": "#185fd0",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -550,12 +550,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#6099f7", "color": "#185fd0",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#6099f7", "color": "#185fd0",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -656,13 +656,12 @@
"syntax": {} "syntax": {}
}, },
"project_diagnostics": { "project_diagnostics": {
"background": "#1c1c1c",
"tab_icon_spacing": 4, "tab_icon_spacing": 4,
"tab_icon_width": 13, "tab_icon_width": 13,
"tab_summary_spacing": 10, "tab_summary_spacing": 10,
"empty_message": { "empty_message": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
}, },
"status_bar_item": { "status_bar_item": {
@ -709,7 +708,7 @@
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
} }
}, },
@ -721,7 +720,7 @@
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
} }
} }
@ -735,7 +734,7 @@
}, },
"channel_name": { "channel_name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"weight": "bold", "weight": "bold",
"size": 14 "size": 14
}, },
@ -751,7 +750,7 @@
"header": { "header": {
"name": { "name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
}, },
"padding": { "padding": {
@ -806,7 +805,7 @@
"active_item": { "active_item": {
"name": { "name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
}, },
"padding": 4, "padding": 4,
@ -823,7 +822,7 @@
"hovered_active_item": { "hovered_active_item": {
"name": { "name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14 "size": 14
}, },
"padding": 4, "padding": 4,
@ -864,7 +863,7 @@
}, },
"hovered_sign_in_prompt": { "hovered_sign_in_prompt": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"underline": true, "underline": true,
"size": 14 "size": 14
}, },
@ -884,7 +883,7 @@
}, },
"sender": { "sender": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"weight": "bold", "weight": "bold",
"size": 14, "size": 14,
"margin": { "margin": {
@ -921,7 +920,7 @@
"corner_radius": 6, "corner_radius": 6,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 16 "size": 16
}, },
"placeholder_text": { "placeholder_text": {
@ -930,8 +929,8 @@
"size": 14 "size": 14
}, },
"selection": { "selection": {
"cursor": "#4287f6", "cursor": "#195cc8",
"selection": "#4287f6" "selection": "#307af3"
}, },
"border": { "border": {
"color": "#393939", "color": "#393939",
@ -995,7 +994,7 @@
}, },
"name": { "name": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 16, "size": 16,
"margin": { "margin": {
"right": 6 "right": 6
@ -1014,7 +1013,7 @@
}, },
"name": { "name": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 16, "size": 16,
"margin": { "margin": {
"right": 6 "right": 6
@ -1023,7 +1022,7 @@
"padding": { "padding": {
"left": 8 "left": 8
}, },
"background": "#ffffff", "background": "#1c1c1c",
"corner_radius": 6 "corner_radius": 6
}, },
"unshared_project": { "unshared_project": {
@ -1063,12 +1062,12 @@
"padding": { "padding": {
"left": 8 "left": 8
}, },
"background": "#ffffff", "background": "#1c1c1c",
"corner_radius": 6 "corner_radius": 6
} }
}, },
"search": { "search": {
"match_background": "#ffffff", "match_background": "#70a919",
"tab_icon_spacing": 4, "tab_icon_spacing": 4,
"tab_icon_width": 14, "tab_icon_width": 14,
"active_hovered_option_button": { "active_hovered_option_button": {
@ -1124,12 +1123,12 @@
"size": 16 "size": 16
}, },
"selection": { "selection": {
"cursor": "#4287f6", "cursor": "#195cc8",
"selection": "#4287f6" "selection": "#307af3"
}, },
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 16 "size": 16
}, },
"border": { "border": {
@ -1178,16 +1177,16 @@
"size": 16 "size": 16
}, },
"selection": { "selection": {
"cursor": "#4287f6", "cursor": "#195cc8",
"selection": "#4287f6" "selection": "#307af3"
}, },
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 16 "size": 16
}, },
"border": { "border": {
"color": "#f47171", "color": "#cd1c1c",
"width": 1 "width": 1
}, },
"margin": { "margin": {
@ -1235,13 +1234,13 @@
}, },
"results_status": { "results_status": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 18 "size": 18
} }
}, },
"breadcrumbs": { "breadcrumbs": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d5d5d5", "color": "#e3e3e3",
"size": 14, "size": 14,
"padding": { "padding": {
"left": 6 "left": 6

View file

@ -13,12 +13,12 @@
"corner_radius": 6, "corner_radius": 6,
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#393939", "color": "#555555",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#4287f6", "color": "#185fd0",
"weight": "bold", "weight": "bold",
"size": 14 "size": 14
} }
@ -33,12 +33,12 @@
"corner_radius": 6, "corner_radius": 6,
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#4287f6", "color": "#185fd0",
"weight": "bold", "weight": "bold",
"size": 14 "size": 14
}, },
@ -51,7 +51,7 @@
"empty": { "empty": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"padding": { "padding": {
@ -66,16 +66,16 @@
"corner_radius": 6, "corner_radius": 6,
"placeholder_text": { "placeholder_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#717171", "color": "#aaaaaa",
"size": 14 "size": 14
}, },
"selection": { "selection": {
"cursor": "#6099f7", "cursor": "#185fd0",
"selection": "#d0e2fd" "selection": "#307af3"
}, },
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 16 "size": 16
}, },
"border": { "border": {
@ -111,13 +111,13 @@
"background": "#f1f1f1", "background": "#f1f1f1",
"icon_close": "#717171", "icon_close": "#717171",
"icon_close_active": "#000000", "icon_close_active": "#000000",
"icon_conflict": "#f6bc09", "icon_conflict": "#bc9212",
"icon_dirty": "#4287f6", "icon_dirty": "#195cc8",
"icon_width": 8, "icon_width": 8,
"spacing": 10, "spacing": 10,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 14 "size": 14
}, },
"border": { "border": {
@ -137,8 +137,8 @@
"background": "#ffffff", "background": "#ffffff",
"icon_close": "#717171", "icon_close": "#717171",
"icon_close_active": "#000000", "icon_close_active": "#000000",
"icon_conflict": "#f6bc09", "icon_conflict": "#bc9212",
"icon_dirty": "#4287f6", "icon_dirty": "#195cc8",
"icon_width": 8, "icon_width": 8,
"spacing": 10, "spacing": 10,
"text": { "text": {
@ -221,17 +221,17 @@
}, },
"cursor_position": { "cursor_position": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"diagnostic_message": { "diagnostic_message": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"lsp_message": { "lsp_message": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
} }
}, },
@ -243,7 +243,7 @@
"share_icon_active_color": "#000000", "share_icon_active_color": "#000000",
"title": { "title": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
}, },
"avatar": { "avatar": {
@ -264,7 +264,7 @@
}, },
"sign_in_prompt": { "sign_in_prompt": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#393939", "color": "#555555",
"size": 13, "size": 13,
"underline": true, "underline": true,
"padding": { "padding": {
@ -289,7 +289,7 @@
}, },
"outdated_warning": { "outdated_warning": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#b48d14", "color": "#b68e14",
"size": 13 "size": 13
} }
}, },
@ -311,7 +311,7 @@
}, },
"breadcrumbs": { "breadcrumbs": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 16, "size": 16,
"padding": { "padding": {
"left": 6 "left": 6
@ -325,54 +325,54 @@
} }
}, },
"editor": { "editor": {
"text_color": "#393939", "text_color": "#2b2b2b",
"background": "#ffffff", "background": "#ffffff",
"active_line_background": "#ffffff", "active_line_background": "#e3e3e3",
"code_actions_indicator": "#717171", "code_actions_indicator": "#717171",
"diff_background_deleted": "#fdd4d4", "diff_background_deleted": "#ec3939",
"diff_background_inserted": "#befad2", "diff_background_inserted": "#21bf5b",
"document_highlight_read_background": "#e3e3e3", "document_highlight_read_background": "#e3e3e3",
"document_highlight_write_background": "#e3e3e3", "document_highlight_write_background": "#e3e3e3",
"error_color": "#d11c1c", "error_color": "#cd1c1c",
"gutter_background": "#ffffff", "gutter_background": "#ffffff",
"gutter_padding_factor": 2.5, "gutter_padding_factor": 2.5,
"highlighted_line_background": "#ffffff", "highlighted_line_background": "#e3e3e3",
"line_number": "#ffffff", "line_number": "#808080",
"line_number_active": "#ffffff", "line_number_active": "#000000",
"rename_fade": 0.6, "rename_fade": 0.6,
"unnecessary_code_fade": 0.5, "unnecessary_code_fade": 0.5,
"selection": { "selection": {
"cursor": "#6099f7", "cursor": "#185fd0",
"selection": "#d0e2fd" "selection": "#307af3"
}, },
"guest_selections": [ "guest_selections": [
{ {
"cursor": "#777af4", "cursor": "#70a919",
"selection": "#d4d5fd" "selection": "#80c517"
}, },
{ {
"cursor": "#23d464", "cursor": "#1e22db",
"selection": "#befad2" "selection": "#5558ee"
}, },
{ {
"cursor": "#f98a3d", "cursor": "#c45c14",
"selection": "#fde0cd" "selection": "#f66e0f"
}, },
{ {
"cursor": "#b671f8", "cursor": "#7d19dc",
"selection": "#e9d4fd" "selection": "#a048f4"
}, },
{ {
"cursor": "#16ddc7", "cursor": "#17a293",
"selection": "#b4faf2" "selection": "#15b3a2"
}, },
{ {
"cursor": "#f58ac0", "cursor": "#d51e79",
"selection": "#fcd4e8" "selection": "#e93d92"
}, },
{ {
"cursor": "#f6bc09", "cursor": "#bc9212",
"selection": "#fceabc" "selection": "#e0ac0b"
} }
], ],
"autocomplete": { "autocomplete": {
@ -406,7 +406,7 @@
"left": -14 "left": -14
}, },
"match_highlight": { "match_highlight": {
"color": "#59c3f5", "color": "#1588bc",
"weight": "normal" "weight": "normal"
}, },
"selected_item": { "selected_item": {
@ -432,7 +432,7 @@
}, },
"code": { "code": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"margin": { "margin": {
"left": 10 "left": 10
@ -441,28 +441,28 @@
"message": { "message": {
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
}, },
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#393939", "color": "#555555",
"size": 14 "size": 14
} }
} }
}, },
"diagnostic_path_header": { "diagnostic_path_header": {
"background": "#ffffff", "background": "#e3e3e3",
"text_scale_factor": 0.857, "text_scale_factor": 0.857,
"filename": { "filename": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
}, },
"path": { "path": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"margin": { "margin": {
"left": 12 "left": 12
@ -481,12 +481,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d11c1c", "color": "#cd1c1c",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#d11c1c", "color": "#cd1c1c",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -504,12 +504,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#b48d14", "color": "#b68e14",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#b48d14", "color": "#b68e14",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -527,12 +527,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1762db", "color": "#185fd0",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1762db", "color": "#185fd0",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -550,12 +550,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1762db", "color": "#185fd0",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1762db", "color": "#185fd0",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -573,12 +573,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -596,12 +596,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -619,12 +619,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -642,12 +642,12 @@
"message": { "message": {
"text": { "text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"highlight_text": { "highlight_text": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"weight": "bold" "weight": "bold"
} }
@ -656,18 +656,17 @@
"syntax": {} "syntax": {}
}, },
"project_diagnostics": { "project_diagnostics": {
"background": "#f1f1f1",
"tab_icon_spacing": 4, "tab_icon_spacing": 4,
"tab_icon_width": 13, "tab_icon_width": 13,
"tab_summary_spacing": 10, "tab_summary_spacing": 10,
"empty_message": { "empty_message": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
}, },
"status_bar_item": { "status_bar_item": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"margin": { "margin": {
"right": 10 "right": 10
@ -686,7 +685,7 @@
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 14 "size": 14
} }
}, },
@ -698,7 +697,7 @@
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 14 "size": 14
} }
}, },
@ -709,7 +708,7 @@
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
} }
}, },
@ -721,7 +720,7 @@
"icon_spacing": 8, "icon_spacing": 8,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
} }
} }
@ -735,13 +734,13 @@
}, },
"channel_name": { "channel_name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"weight": "bold", "weight": "bold",
"size": 14 "size": 14
}, },
"channel_name_hash": { "channel_name_hash": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"padding": { "padding": {
"right": 8 "right": 8
@ -751,7 +750,7 @@
"header": { "header": {
"name": { "name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
}, },
"padding": { "padding": {
@ -760,7 +759,7 @@
}, },
"hash": { "hash": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"margin": { "margin": {
"right": 8 "right": 8
@ -771,13 +770,13 @@
"item": { "item": {
"name": { "name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#393939", "color": "#555555",
"size": 14 "size": 14
}, },
"padding": 4, "padding": 4,
"hash": { "hash": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"margin": { "margin": {
"right": 8 "right": 8
@ -788,13 +787,13 @@
"hovered_item": { "hovered_item": {
"name": { "name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#393939", "color": "#555555",
"size": 14 "size": 14
}, },
"padding": 4, "padding": 4,
"hash": { "hash": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"margin": { "margin": {
"right": 8 "right": 8
@ -806,13 +805,13 @@
"active_item": { "active_item": {
"name": { "name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
}, },
"padding": 4, "padding": 4,
"hash": { "hash": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"margin": { "margin": {
"right": 8 "right": 8
@ -823,13 +822,13 @@
"hovered_active_item": { "hovered_active_item": {
"name": { "name": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14 "size": 14
}, },
"padding": 4, "padding": 4,
"hash": { "hash": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14, "size": 14,
"margin": { "margin": {
"right": 8 "right": 8
@ -858,25 +857,25 @@
}, },
"sign_in_prompt": { "sign_in_prompt": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#393939", "color": "#555555",
"underline": true, "underline": true,
"size": 14 "size": 14
}, },
"hovered_sign_in_prompt": { "hovered_sign_in_prompt": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"underline": true, "underline": true,
"size": 14 "size": 14
}, },
"message": { "message": {
"body": { "body": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#393939", "color": "#555555",
"size": 14 "size": 14
}, },
"timestamp": { "timestamp": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"padding": { "padding": {
@ -884,7 +883,7 @@
}, },
"sender": { "sender": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"weight": "bold", "weight": "bold",
"size": 14, "size": 14,
"margin": { "margin": {
@ -895,12 +894,12 @@
"pending_message": { "pending_message": {
"body": { "body": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"timestamp": { "timestamp": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"size": 14 "size": 14
}, },
"padding": { "padding": {
@ -908,7 +907,7 @@
}, },
"sender": { "sender": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#555555", "color": "#808080",
"weight": "bold", "weight": "bold",
"size": 14, "size": 14,
"margin": { "margin": {
@ -921,17 +920,17 @@
"corner_radius": 6, "corner_radius": 6,
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 16 "size": 16
}, },
"placeholder_text": { "placeholder_text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#717171", "color": "#aaaaaa",
"size": 14 "size": 14
}, },
"selection": { "selection": {
"cursor": "#6099f7", "cursor": "#185fd0",
"selection": "#d0e2fd" "selection": "#307af3"
}, },
"border": { "border": {
"color": "#e3e3e3", "color": "#e3e3e3",
@ -961,7 +960,7 @@
}, },
"host_username": { "host_username": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#555555", "color": "#808080",
"size": 16, "size": 16,
"padding": { "padding": {
"left": 8 "left": 8
@ -976,7 +975,7 @@
}, },
"name": { "name": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 16, "size": 16,
"margin": { "margin": {
"right": 6 "right": 6
@ -995,7 +994,7 @@
}, },
"name": { "name": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 16, "size": 16,
"margin": { "margin": {
"right": 6 "right": 6
@ -1014,7 +1013,7 @@
}, },
"name": { "name": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 16, "size": 16,
"margin": { "margin": {
"right": 6 "right": 6
@ -1023,7 +1022,7 @@
"padding": { "padding": {
"left": 8 "left": 8
}, },
"background": "#ffffff", "background": "#e3e3e3",
"corner_radius": 6 "corner_radius": 6
}, },
"unshared_project": { "unshared_project": {
@ -1035,7 +1034,7 @@
}, },
"name": { "name": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 16, "size": 16,
"margin": { "margin": {
"right": 6 "right": 6
@ -1054,7 +1053,7 @@
}, },
"name": { "name": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 16, "size": 16,
"margin": { "margin": {
"right": 6 "right": 6
@ -1063,7 +1062,7 @@
"padding": { "padding": {
"left": 8 "left": 8
}, },
"background": "#ffffff", "background": "#e3e3e3",
"corner_radius": 6 "corner_radius": 6
} }
}, },
@ -1073,7 +1072,7 @@
"tab_icon_width": 14, "tab_icon_width": 14,
"active_hovered_option_button": { "active_hovered_option_button": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 16, "size": 16,
"background": "#e3e3e3", "background": "#e3e3e3",
"corner_radius": 6, "corner_radius": 6,
@ -1094,7 +1093,7 @@
}, },
"active_option_button": { "active_option_button": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 16, "size": 16,
"background": "#e3e3e3", "background": "#e3e3e3",
"corner_radius": 6, "corner_radius": 6,
@ -1120,16 +1119,16 @@
"max_width": 500, "max_width": 500,
"placeholder_text": { "placeholder_text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#717171", "color": "#aaaaaa",
"size": 16 "size": 16
}, },
"selection": { "selection": {
"cursor": "#6099f7", "cursor": "#185fd0",
"selection": "#d0e2fd" "selection": "#307af3"
}, },
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 16 "size": 16
}, },
"border": { "border": {
@ -1148,7 +1147,7 @@
}, },
"hovered_option_button": { "hovered_option_button": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 16, "size": 16,
"background": "#e3e3e3", "background": "#e3e3e3",
"corner_radius": 6, "corner_radius": 6,
@ -1174,20 +1173,20 @@
"max_width": 500, "max_width": 500,
"placeholder_text": { "placeholder_text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#717171", "color": "#aaaaaa",
"size": 16 "size": 16
}, },
"selection": { "selection": {
"cursor": "#6099f7", "cursor": "#185fd0",
"selection": "#d0e2fd" "selection": "#307af3"
}, },
"text": { "text": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 16 "size": 16
}, },
"border": { "border": {
"color": "#fbbdbd", "color": "#e72727",
"width": 1 "width": 1
}, },
"margin": { "margin": {
@ -1202,13 +1201,13 @@
}, },
"match_index": { "match_index": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#555555", "color": "#808080",
"size": 16, "size": 16,
"padding": 6 "padding": 6
}, },
"option_button": { "option_button": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#393939", "color": "#555555",
"size": 16, "size": 16,
"background": "#f1f1f1", "background": "#f1f1f1",
"corner_radius": 6, "corner_radius": 6,
@ -1235,13 +1234,13 @@
}, },
"results_status": { "results_status": {
"family": "Zed Mono", "family": "Zed Mono",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 18 "size": 18
} }
}, },
"breadcrumbs": { "breadcrumbs": {
"family": "Zed Sans", "family": "Zed Sans",
"color": "#1c1c1c", "color": "#2b2b2b",
"size": 14, "size": 14,
"padding": { "padding": {
"left": 6 "left": 6

View file

@ -1,6 +1,6 @@
import Theme from "../themes/theme"; import Theme from "../themes/theme";
import chatPanel from "./chatPanel"; import chatPanel from "./chatPanel";
import { backgroundColor, borderColor, text } from "./components"; import { text } from "./components";
import contactsPanel from "./contactsPanel"; import contactsPanel from "./contactsPanel";
import editor from "./editor"; import editor from "./editor";
import projectPanel from "./projectPanel"; import projectPanel from "./projectPanel";
@ -18,7 +18,6 @@ export default function app(theme: Theme): Object {
workspace: workspace(theme), workspace: workspace(theme),
editor: editor(theme), editor: editor(theme),
projectDiagnostics: { projectDiagnostics: {
background: backgroundColor(theme, 300),
tabIconSpacing: 4, tabIconSpacing: 4,
tabIconWidth: 13, tabIconWidth: 13,
tabSummarySpacing: 10, tabSummarySpacing: 10,

View file

@ -38,7 +38,8 @@ export default function editor(theme: Theme) {
} }
return { return {
textColor: theme.textColor.secondary.value, // textColor: theme.syntax.primary.color,
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, "secondary"),

View file

@ -16,9 +16,9 @@ const backgroundColor = {
}, },
500: { 500: {
base: colors.neutral[900], base: colors.neutral[900],
hovered: colors.neutral[900], hovered: colors.neutral[850],
active: colors.neutral[900], active: colors.neutral[800],
focused: colors.neutral[900], focused: colors.neutral[850],
}, },
ok: { ok: {
base: colors.green[600], base: colors.green[600],
@ -59,7 +59,7 @@ const borderColor = {
}; };
const textColor = { const textColor = {
primary: colors.neutral[150], primary: colors.neutral[100],
secondary: colors.neutral[350], secondary: colors.neutral[350],
muted: colors.neutral[550], muted: colors.neutral[550],
placeholder: colors.neutral[750], placeholder: colors.neutral[750],
@ -90,49 +90,49 @@ const player = {
1: { 1: {
baseColor: colors.blue[600], baseColor: colors.blue[600],
cursorColor: colors.blue[600], cursorColor: colors.blue[600],
selectionColor: colors.blue[600], selectionColor: colors.blue[100],
borderColor: colors.blue[600], borderColor: colors.blue[600],
}, },
2: { 2: {
baseColor: colors.indigo[500], baseColor: colors.lime[500],
cursorColor: colors.indigo[500], cursorColor: colors.lime[500],
selectionColor: colors.indigo[500], selectionColor: colors.lime[100],
borderColor: colors.indigo[500], borderColor: colors.lime[500],
}, },
3: { 3: {
baseColor: colors.green[500], baseColor: colors.indigo[500],
cursorColor: colors.green[500], cursorColor: colors.indigo[500],
selectionColor: colors.green[500], selectionColor: colors.indigo[100],
borderColor: colors.green[500], borderColor: colors.indigo[500],
}, },
4: { 4: {
baseColor: colors.orange[500], baseColor: colors.orange[500],
cursorColor: colors.orange[500], cursorColor: colors.orange[500],
selectionColor: colors.orange[500], selectionColor: colors.orange[100],
borderColor: colors.orange[500], borderColor: colors.orange[500],
}, },
5: { 5: {
baseColor: colors.purple[500], baseColor: colors.purple[500],
cursorColor: colors.purple[500], cursorColor: colors.purple[500],
selectionColor: colors.purple[500], selectionColor: colors.purple[100],
borderColor: colors.purple[500], borderColor: colors.purple[500],
}, },
6: { 6: {
baseColor: colors.teal[400], baseColor: colors.teal[400],
cursorColor: colors.teal[400], cursorColor: colors.teal[400],
selectionColor: colors.teal[400], selectionColor: colors.teal[100],
borderColor: colors.teal[400], borderColor: colors.teal[400],
}, },
7: { 7: {
baseColor: colors.pink[400], baseColor: colors.pink[400],
cursorColor: colors.pink[400], cursorColor: colors.pink[400],
selectionColor: colors.pink[400], selectionColor: colors.pink[100],
borderColor: colors.pink[400], borderColor: colors.pink[400],
}, },
8: { 8: {
baseColor: colors.yellow[400], baseColor: colors.yellow[400],
cursorColor: colors.yellow[400], cursorColor: colors.yellow[400],
selectionColor: colors.yellow[400], selectionColor: colors.yellow[100],
borderColor: colors.yellow[400], borderColor: colors.yellow[400],
}, },
}; };
@ -143,24 +143,24 @@ const editor = {
indent_guide: borderColor.muted, indent_guide: borderColor.muted,
indent_guide_active: borderColor.secondary, indent_guide_active: borderColor.secondary,
line: { line: {
active: colors.neutral[0], active: backgroundColor[500].active,
highlighted: colors.neutral[0], highlighted: backgroundColor[500].hovered,
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: backgroundColor[500].active, occurrence: colors.indigo[500], // TODO: Why does indigo[500], indigo[100], and indigo[900] all give me the same color? @kethku
activeOccurrence: colors.neutral[0], activeOccurrence: colors.indigo[400], // TODO: We don't seem to be using this right now in rust
matchingBracket: colors.neutral[0], matchingBracket: backgroundColor[500].active,
match: colors.neutral[0], match: colors.lime[500],
activeMatch: colors.neutral[0], activeMatch: colors.lime[400],
related: colors.neutral[0], related: backgroundColor[500].focused,
}, },
gutter: { gutter: {
primary: colors.neutral[0], primary: textColor.muted,
active: colors.neutral[0], active: textColor.active,
}, },
}; };

View file

@ -61,16 +61,16 @@ const borderColor = {
}; };
const textColor = { const textColor = {
primary: colors.neutral[800], primary: colors.neutral[750],
secondary: colors.neutral[700], secondary: colors.neutral[600],
muted: colors.neutral[600], muted: colors.neutral[450],
placeholder: colors.neutral[500], placeholder: colors.neutral[300],
active: colors.neutral[900], active: colors.neutral[900],
feature: colors.blue[600], feature: colors.blue[500],
ok: colors.green[800], ok: colors.green[500],
error: colors.red[800], error: colors.red[500],
warning: colors.yellow[800], warning: colors.yellow[500],
info: colors.blue[800], info: colors.blue[500],
}; };
const iconColor = { const iconColor = {
@ -94,17 +94,17 @@ const player = {
borderColor: colors.blue[500], borderColor: colors.blue[500],
}, },
2: { 2: {
baseColor: colors.lime[500],
cursorColor: colors.lime[500],
selectionColor: colors.lime[100],
borderColor: colors.lime[500],
},
3: {
baseColor: colors.indigo[500], baseColor: colors.indigo[500],
cursorColor: colors.indigo[500], cursorColor: colors.indigo[500],
selectionColor: colors.indigo[100], selectionColor: colors.indigo[100],
borderColor: colors.indigo[500], borderColor: colors.indigo[500],
}, },
3: {
baseColor: colors.green[500],
cursorColor: colors.green[500],
selectionColor: colors.green[100],
borderColor: colors.green[500],
},
4: { 4: {
baseColor: colors.orange[500], baseColor: colors.orange[500],
cursorColor: colors.orange[500], cursorColor: colors.orange[500],
@ -143,8 +143,8 @@ const editor = {
indent_guide: borderColor.muted, indent_guide: borderColor.muted,
indent_guide_active: borderColor.secondary, indent_guide_active: borderColor.secondary,
line: { line: {
active: colors.neutral[0], active: backgroundColor[500].active,
highlighted: colors.neutral[0], highlighted: backgroundColor[500].active,
inserted: backgroundColor.ok.active, inserted: backgroundColor.ok.active,
deleted: backgroundColor.error.active, deleted: backgroundColor.error.active,
modified: backgroundColor.info.active, modified: backgroundColor.info.active,
@ -159,8 +159,8 @@ const editor = {
related: colors.neutral[0], related: colors.neutral[0],
}, },
gutter: { gutter: {
primary: colors.neutral[0], primary: textColor.muted,
active: colors.neutral[0], active: textColor.active,
}, },
}; };

View file

@ -22,8 +22,8 @@ export function colorRamp(
.scale([startColor, color, endColor]) .scale([startColor, color, endColor])
.domain([0, 0.5, 1]) .domain([0, 0.5, 1])
.mode("hsl") .mode("hsl")
.gamma(1) .gamma(0.2)
.correctLightness(true) // .correctLightness(true)
.padding([0, 0.15]); .padding([0, 0.15]);
} }