From b1eda1ac39fad5a1eeab3ec7649bbe411f1d1c32 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Wed, 6 Apr 2022 12:25:15 -0400 Subject: [PATCH] Add border to top of status bar --- crates/zed/assets/themes/dark.json | 10 ++++++++-- crates/zed/assets/themes/light.json | 28 +++++++++++++++++----------- styles/src/styleTree/workspace.ts | 3 ++- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/crates/zed/assets/themes/dark.json b/crates/zed/assets/themes/dark.json index 56cef12693..ccd6ef82e0 100644 --- a/crates/zed/assets/themes/dark.json +++ b/crates/zed/assets/themes/dark.json @@ -219,6 +219,12 @@ "left": 6, "right": 6 }, + "border": { + "color": "#070707", + "width": 1, + "top": true, + "overlay": true + }, "cursor_position": { "family": "Zed Sans", "color": "#808080", @@ -265,7 +271,7 @@ "sign_in_prompt": { "family": "Zed Sans", "color": "#9c9c9c", - "size": 13, + "size": 12, "underline": true, "padding": { "right": 8 @@ -274,7 +280,7 @@ "hovered_sign_in_prompt": { "family": "Zed Sans", "color": "#ffffff", - "size": 13, + "size": 12, "underline": true, "padding": { "right": 8 diff --git a/crates/zed/assets/themes/light.json b/crates/zed/assets/themes/light.json index d601ecbccc..7d963a8839 100644 --- a/crates/zed/assets/themes/light.json +++ b/crates/zed/assets/themes/light.json @@ -18,7 +18,7 @@ }, "highlight_text": { "family": "Zed Sans", - "color": "#484bed", + "color": "#1b1edc", "weight": "bold", "size": 14 } @@ -38,7 +38,7 @@ }, "highlight_text": { "family": "Zed Sans", - "color": "#484bed", + "color": "#1b1edc", "weight": "bold", "size": 14 }, @@ -219,6 +219,12 @@ "left": 6, "right": 6 }, + "border": { + "color": "#d5d5d5", + "width": 1, + "top": true, + "overlay": true + }, "cursor_position": { "family": "Zed Sans", "color": "#636363", @@ -265,7 +271,7 @@ "sign_in_prompt": { "family": "Zed Sans", "color": "#474747", - "size": 13, + "size": 12, "underline": true, "padding": { "right": 8 @@ -274,7 +280,7 @@ "hovered_sign_in_prompt": { "family": "Zed Sans", "color": "#000000", - "size": 13, + "size": 12, "underline": true, "padding": { "right": 8 @@ -407,7 +413,7 @@ }, "match_highlight": { "family": "Zed Mono", - "color": "#484bed", + "color": "#1b1edc", "size": 14 }, "selected_item": { @@ -656,21 +662,21 @@ }, "syntax": { "keyword": "#1819a1", - "function": "#f9812e", + "function": "#bb550e", "string": "#eb2d2d", - "type": "#de900c", + "type": "#a8820e", "number": "#484bed", "comment": "#717171", - "property": "#118a62", - "variant": "#1096d3", + "property": "#106c4e", + "variant": "#97142a", "constant": "#1c1c1c", "title": { "color": "#1096d3", "weight": "bold" }, - "emphasis": "#484bed", + "emphasis": "#1b1edc", "emphasis_strong": { - "color": "#484bed", + "color": "#1b1edc", "weight": "bold" }, "link_uri": { diff --git a/styles/src/styleTree/workspace.ts b/styles/src/styleTree/workspace.ts index 9e35052abf..42cd5b20d5 100644 --- a/styles/src/styleTree/workspace.ts +++ b/styles/src/styleTree/workspace.ts @@ -1,5 +1,5 @@ import Theme from "../themes/theme"; -import { backgroundColor, border, iconColor, text } from "./components"; +import { backgroundColor, border, borderColor, iconColor, text } from "./components"; export default function workspace(theme: Theme) { const signInPrompt = { @@ -88,6 +88,7 @@ export default function workspace(theme: Theme) { left: 6, right: 6, }, + border: border(theme, "primary", { top: true, overlay: true }), cursorPosition: text(theme, "sans", "muted"), diagnosticMessage: text(theme, "sans", "muted"), lspMessage: text(theme, "sans", "muted"),