From c21ed0a8b6d6e3f3c2c9c97b00a8dc82e3eb8804 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Thu, 25 May 2023 13:28:48 +0530
Subject: [PATCH] chore: normal button color

---
 .../assets/org.standardnotes.theme-focus/index.css |  1 +
 .../src/javascripts/Components/Button/Button.tsx   | 14 +++++++-------
 packages/web/src/stylesheets/_theme.scss           |  2 ++
 packages/web/tailwind.config.js                    |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/web/src/components/assets/org.standardnotes.theme-focus/index.css b/packages/web/src/components/assets/org.standardnotes.theme-focus/index.css
index f976feaee..702404e65 100644
--- a/packages/web/src/components/assets/org.standardnotes.theme-focus/index.css
+++ b/packages/web/src/components/assets/org.standardnotes.theme-focus/index.css
@@ -46,4 +46,5 @@
   --sn-stylekit-scrollbar-thumb-color: var(--sn-stylekit-info-color);
   --sn-stylekit-menu-border: 1px solid #424242;
   --navigation-item-selected-background-color: var(--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 c6b201eff..a853957fe 100644
--- a/packages/web/src/javascripts/Components/Button/Button.tsx
+++ b/packages/web/src/javascripts/Components/Button/Button.tsx
@@ -5,19 +5,19 @@ export type ButtonStyle = 'default' | 'contrast' | 'neutral' | 'info' | 'warning
 const getColorsForNormalVariant = (style: ButtonStyle) => {
   switch (style) {
     case 'default':
-      return 'bg-passive-5 text-text'
+      return 'bg-normal-button text-text'
     case 'contrast':
-      return 'bg-passive-5 text-contrast'
+      return 'bg-normal-button text-contrast'
     case 'neutral':
-      return 'bg-passive-5 text-neutral'
+      return 'bg-normal-button text-neutral'
     case 'info':
-      return 'bg-passive-5 text-info'
+      return 'bg-normal-button text-info'
     case 'warning':
-      return 'bg-passive-5 text-warning'
+      return 'bg-normal-button text-warning'
     case 'danger':
-      return 'bg-passive-5 text-danger'
+      return 'bg-normal-button text-danger'
     case 'success':
-      return 'bg-passive-5 text-success'
+      return 'bg-normal-button text-success'
   }
 }
 
diff --git a/packages/web/src/stylesheets/_theme.scss b/packages/web/src/stylesheets/_theme.scss
index 9768a9ca1..a4538da18 100644
--- a/packages/web/src/stylesheets/_theme.scss
+++ b/packages/web/src/stylesheets/_theme.scss
@@ -41,4 +41,6 @@
 
   --panel-resizer-background-color: var(--sn-stylekit-secondary-contrast-background-color);
   --link-element-color: var(--sn-stylekit-info-color);
+
+  --normal-button-background-color: var(--sn-stylekit-background-color);
 }
diff --git a/packages/web/tailwind.config.js b/packages/web/tailwind.config.js
index 37c927c9c..893eaf0ae 100644
--- a/packages/web/tailwind.config.js
+++ b/packages/web/tailwind.config.js
@@ -143,6 +143,7 @@ module.exports = {
       'accessory-tint-4': 'var(--sn-stylekit-accessory-tint-color-4)',
       'accessory-tint-5': 'var(--sn-stylekit-accessory-tint-color-5)',
       'accessory-tint-6': 'var(--sn-stylekit-accessory-tint-color-6)',
+      'normal-button': 'var(--normal-button-background-color)',
     },
   },
   safelist: [