From c29832ab77fd111962a662eda0112f99f17a12f1 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Fri, 26 May 2023 13:28:28 +0530 Subject: [PATCH] chore: buttons in dark themes --- .../components/assets/org.standardnotes.theme-futura/index.css | 1 + .../assets/org.standardnotes.theme-midnight/index.css | 1 + .../assets/org.standardnotes.theme-solarized-dark/index.css | 1 + packages/web/src/javascripts/Components/Button/Button.tsx | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/web/src/components/assets/org.standardnotes.theme-futura/index.css b/packages/web/src/components/assets/org.standardnotes.theme-futura/index.css index b34e839a6..8d473400d 100644 --- a/packages/web/src/components/assets/org.standardnotes.theme-futura/index.css +++ b/packages/web/src/components/assets/org.standardnotes.theme-futura/index.css @@ -42,4 +42,5 @@ --sn-desktop-titlebar-ui-hover-color: var(--highlight-color); --sn-stylekit-menu-border: 1px solid #434b60; --navigation-item-selected-background-color: var(--sn-stylekit-background-color); + --normal-button-background-color: var(--sn-stylekit-passive-color-5); } diff --git a/packages/web/src/components/assets/org.standardnotes.theme-midnight/index.css b/packages/web/src/components/assets/org.standardnotes.theme-midnight/index.css index aad0384a1..318b0b628 100644 --- a/packages/web/src/components/assets/org.standardnotes.theme-midnight/index.css +++ b/packages/web/src/components/assets/org.standardnotes.theme-midnight/index.css @@ -43,4 +43,5 @@ --sn-stylekit-scrollbar-thumb-color: var(--sn-stylekit-info-color); --sn-stylekit-menu-border: 1px solid #494965; --navigation-item-selected-background-color: var(--sn-stylekit-background-color); + --normal-button-background-color: var(--sn-stylekit-passive-color-5); } diff --git a/packages/web/src/components/assets/org.standardnotes.theme-solarized-dark/index.css b/packages/web/src/components/assets/org.standardnotes.theme-solarized-dark/index.css index 913389a62..058df9e34 100644 --- a/packages/web/src/components/assets/org.standardnotes.theme-solarized-dark/index.css +++ b/packages/web/src/components/assets/org.standardnotes.theme-solarized-dark/index.css @@ -58,4 +58,5 @@ --sn-desktop-titlebar-ui-hover-color: var(--highlight-color); --sn-stylekit-menu-border: 1px solid #1f5461; --navigation-item-selected-background-color: var(--sn-stylekit-background-color); + --normal-button-background-color: var(--sn-stylekit-passive-color-5); } diff --git a/packages/web/src/javascripts/Components/Button/Button.tsx b/packages/web/src/javascripts/Components/Button/Button.tsx index a853957fe..303561a8b 100644 --- a/packages/web/src/javascripts/Components/Button/Button.tsx +++ b/packages/web/src/javascripts/Components/Button/Button.tsx @@ -59,7 +59,7 @@ const getClassName = ( let focusHoverStates = primary ? 'hover:brightness-125 focus:outline-none focus:brightness-125' - : 'focus:bg-contrast focus:outline-none hover:bg-contrast' + : 'focus:bg-contrast focus:outline-none hover:border-info hover:text-info hover:bg-contrast' if (disabled) { colors = primary ? 'bg-passive-2 text-info-contrast' : 'bg-default text-passive-2'