Merge branch 'main' into styling

Max Brunsfeld created 4 years ago

Change summary

zed/app-icon.png             |  0 
zed/[e-mail]          |  0 
zed/assets/themes/_base.toml | 21 ++++++++++-------
zed/assets/themes/black.toml | 44 ++++++++++++++++++++++++++++++++++++++
zed/assets/themes/dark.toml  | 27 ++++++++++++++++------
zed/assets/themes/light.toml | 30 +++++++++++++++++--------
6 files changed, 95 insertions(+), 27 deletions(-)

Detailed changes

zed/app-icon.png

zed/[e-mail]

zed/assets/themes/_base.toml

@@ -21,6 +21,7 @@ text = "$text.0"
 
 [workspace.sidebar]
 padding = { left = 10, right = 10 }
+border = { right = true, width = 1, color = "$border.0"}
 
 [workspace.sidebar.resize_handle]
 padding = { left = 1 }
@@ -45,6 +46,7 @@ border = { width = 1, color = "$surface.1", left = true }
 [chat_panel]
 channel_name = { extends = "$text.0", weight = "bold" }
 channel_name_hash = { text = "$text.2", padding.right = 5 }
+border = { left = true, width = 1, color = "$border.0"}
 padding = 10
 
 [chat_panel.message]
@@ -102,30 +104,31 @@ extends = "$chat_panel.sign_in_prompt"
 color = "$text.1.color"
 
 [selector]
-background = "$surface.2"
+background = "$surface.0"
 text = "$text.0"
-padding = 6
+padding = 8
 margin.top = 12
 corner_radius = 6
-shadow = { offset = [0, 0], blur = 12, color = "#00000088" }
+shadow = { offset = [0, 2], blur = 16, color = "$shadow.0" }
 input_editor = "$chat_panel.input_editor"
+border = { width = 1, color = "$border.0"}
 
 [selector.item]
-background = "#424344"
 text = "$text.1"
-highlight_text = { extends = "$text.base", color = "#18a3ff", weight = "bold" }
-border = { color = "#000000", width = 1 }
-padding = 6
+highlight_text = { extends = "$text.base", color = "$syntax.keyword.color", weight = "$syntax.keyword.weight" }
+padding = { left = 16, right = 16, top = 4, bottom = 4 }
+corner_radius = 6
 
 [selector.active_item]
 extends = "$selector.item"
-background = "#094771"
+background = "$state.hover"
+text = "$text.0"
 
 [editor]
 text = "$text.1.color"
 background = "$surface.1"
 gutter_background = "$surface.1"
-active_line_background = "$surface.2"
+active_line_background = "$state.active_line"
 line_number = "$text.2.color"
 line_number_active = "$text.0.color"
 selection = "$selection.host"

zed/assets/themes/black.toml

@@ -0,0 +1,44 @@
+extends = "_base"
+
+[surface]
+0 = "#222324"
+1 = "#141516"
+2 = "#131415"
+
+[border]
+0 = "#0F1011"
+
+[text]
+base = { family = "Inconsolata", size = 14 }
+0 = { extends = "$text.base", color = "#ffffff" }
+1 = { extends = "$text.base", color = "#b3b3b3" }
+2 = { extends = "$text.base", color = "#7b7d80" }
+3 = { extends = "$text.base", color = "#66686A" }
+
+[shadow]
+0 = "#00000052"
+
+[selection]
+host = { selection = "#264f78", cursor = "$text.0.color" }
+guests = [{ selection = "#504f31", cursor = "#fcf154" }]
+
+[status]
+good = "#4fac63"
+info = "#3c5dd4"
+warn = "#faca50"
+bad = "#b7372e"
+
+[state]
+active_line = "#1F2022"
+hover = "#00000033"
+
+[syntax]
+keyword = { color = "#0086c0", weight = "bold" }
+function = "#dcdcaa"
+string = "#cb8f77"
+type = "#4ec9b0"
+number = "#b5cea8"
+comment = "#6a9955"
+property = "#4e94ce"
+variant = "#4fc1ff"
+constant = "#9cdcfe"

zed/assets/themes/dark.toml

@@ -1,15 +1,22 @@
 extends = "_base"
 
 [surface]
-0 = "#222324"
-1 = "#141516"
-2 = "#131415"
+0 = "#283340"
+1 = "#1C2733"
+2 = "#1C2733"
+
+[border]
+0 = "#1B222B"
 
 [text]
 base = { family = "Inconsolata", size = 14 }
-0 = { extends = "$text.base", color = "#ffffff" }
-1 = { extends = "$text.base", color = "#b3b3b3" }
-2 = { extends = "$text.base", color = "#7b7d80" }
+0 = { extends = "$text.base", color = "#FFFFFF" }
+1 = { extends = "$text.base", color = "#CDD1E2" }
+2 = { extends = "$text.base", color = "#9BA8BE" }
+3 = { extends = "$text.base", color = "#6E7483" }
+
+[shadow]
+0 = "#00000052"
 
 [selection]
 host = { selection = "#264f78", cursor = "$text.0.color" }
@@ -21,13 +28,17 @@ info = "#3c5dd4"
 warn = "#faca50"
 bad = "#b7372e"
 
+[state]
+active_line = "#19222D"
+hover = "#00000033"
+
 [syntax]
 keyword = { color = "#0086c0", weight = "bold" }
-function = { color = "#dcdcaa" }
+function = { color = "#dcdcaa", underline = true }
 string = "#cb8f77"
 type = "#4ec9b0"
 number = "#b5cea8"
 comment = "#6a9955"
 property = "#4e94ce"
 variant = "#4fc1ff"
-constant = "#9cdcfe"
+constant = "#9cdcfe"

zed/assets/themes/light.toml

@@ -1,19 +1,25 @@
 extends = "_base"
 
 [surface]
-0 = "#ffffff"
-1 = "#f3f3f3"
-2 = "#ececec"
-3 = "#3a3b3c"
+0 = "#EAEAEB"
+1 = "#FAFAFA"
+2 = "#FFFFFF"
+
+[border]
+0 = "#DBDBDC"
 
 [text]
 base = { family = "Inconsolata", size = 14 }
-0 = { extends = "$text.base", color = "#acacac" }
-1 = { extends = "$text.base", color = "#111111" }
-2 = { extends = "$text.base", color = "#333333" }
+0 = { extends = "$text.base", color = "#000000" }
+1 = { extends = "$text.base", color = "#29292B" }
+2 = { extends = "$text.base", color = "#7E7E83" }
+3 = { extends = "$text.base", color = "#939393" }
+
+[shadow]
+0 = "#0000000D"
 
 [selection]
-host = { selection = "#264f78", cursor = "$text.0.color" }
+host = { selection = "#D4D9EE", cursor = "$text.0.color" }
 guests = [{ selection = "#504f31", cursor = "#fcf154" }]
 
 [status]
@@ -22,8 +28,12 @@ info = "#3c5dd4"
 warn = "#faca50"
 bad = "#b7372e"
 
+[state]
+active_line = "#EAECF2"
+hover = "#0000000D"
+
 [syntax]
-keyword = "#0000fa"
+keyword = { color = "#0000fa", weight = "bold" }
 function = "#795e26"
 string = "#a82121"
 type = "#267f29"
@@ -31,4 +41,4 @@ number = "#b5cea8"
 comment = "#6a9955"
 property = "#4e94ce"
 variant = "#4fc1ff"
-constant = "#9cdcfe"
+constant = "#9cdcfe"