From 364c3f2f0054f3d05c8ceae049bcf8164acd8dd6 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Wed, 19 Oct 2022 13:03:58 -0400 Subject: [PATCH] Contrast rebalances --- styles/src/styleTree/picker.ts | 6 +++--- styles/src/styleTree/search.ts | 6 +++--- styles/src/themes/common/ramps.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/styles/src/styleTree/picker.ts b/styles/src/styleTree/picker.ts index 79479c108f..3e126f4f2e 100644 --- a/styles/src/styleTree/picker.ts +++ b/styles/src/styleTree/picker.ts @@ -28,9 +28,9 @@ export default function picker(colorScheme: ColorScheme) { text: text(layer, "sans", "variant"), highlightText: text(layer, "sans", "accent", { weight: "bold" }), active: { - background: background(layer, "base", "inverted"), - text: text(layer, "sans", "base", "inverted"), - highlightText: text(layer, "sans", "accent", "inverted", { + background: background(layer, "base", "active"), + text: text(layer, "sans", "base", "active"), + highlightText: text(layer, "sans", "accent", { weight: "bold", }), }, diff --git a/styles/src/styleTree/search.ts b/styles/src/styleTree/search.ts index 98c5b35184..a9a8a18821 100644 --- a/styles/src/styleTree/search.ts +++ b/styles/src/styleTree/search.ts @@ -44,9 +44,9 @@ export default function search(colorScheme: ColorScheme) { top: 2, }, active: { - ...text(layer, "mono", "on", "active"), - background: background(layer, "on", "active"), - border: border(layer, "on", "active"), + ...text(layer, "mono", "on", "inverted"), + background: background(layer, "on", "inverted"), + border: border(layer, "on", "inverted"), }, clicked: { ...text(layer, "mono", "on", "pressed"), diff --git a/styles/src/themes/common/ramps.ts b/styles/src/themes/common/ramps.ts index 5d6f6ad3d3..fcca61ad8c 100644 --- a/styles/src/themes/common/ramps.ts +++ b/styles/src/themes/common/ramps.ts @@ -227,7 +227,7 @@ function buildStyleDefinition(bgBase: number, fgBase: number, step: number = 0.0 default: bgBase, hovered: bgBase + step, pressed: bgBase + step * 1.5, - active: bgBase + step * 3, + active: bgBase + step * 2.2, disabled: bgBase, inverted: fgBase + step * 6, },