From ea11f2e183d3ae14718aaf8c1433df5c562c46f0 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Wed, 20 Apr 2022 11:54:57 -0400 Subject: [PATCH] Increase min-width for all Pickers, minor style changes - Increases the Picker min-width from 500 to 540 - Makes some changes to the styling of keyboard shortcuts in the command palette --- assets/themes/dark.json | 4 ++-- assets/themes/light.json | 2 +- crates/picker/src/picker.rs | 2 +- styles/src/styleTree/commandPalette.ts | 2 +- styles/src/themes/dark.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/themes/dark.json b/assets/themes/dark.json index 77d3706e3b..42785b123c 100644 --- a/assets/themes/dark.json +++ b/assets/themes/dark.json @@ -731,11 +731,11 @@ "key": { "text": { "family": "Zed Mono", - "color": "#ffffff", + "color": "#9c9c9c", "size": 12 }, "corner_radius": 4, - "background": "#0e0e0e", + "background": "#0e0e0e80", "border": { "color": "#232323", "width": 1 diff --git a/assets/themes/light.json b/assets/themes/light.json index dc4381ada8..9d810765e1 100644 --- a/assets/themes/light.json +++ b/assets/themes/light.json @@ -731,7 +731,7 @@ "key": { "text": { "family": "Zed Mono", - "color": "#000000", + "color": "#474747", "size": 12 }, "corner_radius": 4, diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs index f234672478..ff9d653bc0 100644 --- a/crates/picker/src/picker.rs +++ b/crates/picker/src/picker.rs @@ -138,7 +138,7 @@ impl Picker { list_state: Default::default(), update_task: None, delegate, - max_size: vec2f(500., 420.), + max_size: vec2f(540., 420.), confirmed: false, }; cx.defer(|this, cx| this.update_matches(cx)); diff --git a/styles/src/styleTree/commandPalette.ts b/styles/src/styleTree/commandPalette.ts index 9242f67cbe..fbd9bea9b0 100644 --- a/styles/src/styleTree/commandPalette.ts +++ b/styles/src/styleTree/commandPalette.ts @@ -5,7 +5,7 @@ export default function commandPalette(theme: Theme) { return { keystrokeSpacing: 8, key: { - text: text(theme, "mono", "active", { size: "xs" }), + text: text(theme, "mono", "secondary", { size: "xs" }), cornerRadius: 4, background: backgroundColor(theme, "on300"), border: border(theme, "secondary"), diff --git a/styles/src/themes/dark.ts b/styles/src/themes/dark.ts index 095c5864ef..f7407699dd 100644 --- a/styles/src/themes/dark.ts +++ b/styles/src/themes/dark.ts @@ -22,7 +22,7 @@ const backgroundColor = { focused: colors.neutral[825], }, on300: { - base: colors.neutral[850], + base: withOpacity(colors.neutral[850], 0.5), hovered: colors.neutral[875], active: colors.neutral[900], focused: colors.neutral[875],