From df06dcaea7e5331d1e165f859c842a81c465e03a Mon Sep 17 00:00:00 2001
From: Sarin Na Wangkanai <10666633+wangkanai@users.noreply.github.com>
Date: Thu, 1 Sep 2022 18:32:19 +0700
Subject: [PATCH] fixed card bg & color for light & dark mode

---
 src/scss/_variables.scss   | 3 ++-
 src/scss/layout/_dark.scss | 2 ++
 src/scss/ui/_buttons.scss  | 4 ++--
 src/scss/ui/_cards.scss    | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index c0fbbef9..8cd22fa0 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -382,7 +382,8 @@ $btn-border-radius: $border-radius !default;
 //cards
 $card-title-spacer-y: 1.25rem !default;
 
-$card-bg: $white !default;
+$card-bg: $light !default;
+$card-bg-hover: $white !default;
 $card-color: $dark !default;
 
 $card-border-width: $border-width !default;
diff --git a/src/scss/layout/_dark.scss b/src/scss/layout/_dark.scss
index 01e62daa..c60d9d18 100644
--- a/src/scss/layout/_dark.scss
+++ b/src/scss/layout/_dark.scss
@@ -19,7 +19,9 @@ body:not(.theme-dark) .hide-theme-light {
     --#{$prefix}body-bg-rgb: #{to-rgb($dark-mode-darken)};
 
     --#{$prefix}card-bg: #{$dark-mode-darken};
+    --#{$prefix}card-bg-hover: #{$dark-mode-darken};
     --#{$prefix}card-bg-rgb: #{to-rgb($dark-mode-darken)};
+    --#{$prefix}card-color: #{$dark-mode-text};
 
     --#{$prefix}border-color: #{$dark-mode-border-color};
     --#{$prefix}border-color-light: #{$dark-mode-border-color-light};
diff --git a/src/scss/ui/_buttons.scss b/src/scss/ui/_buttons.scss
index 5ef7592f..733958d8 100644
--- a/src/scss/ui/_buttons.scss
+++ b/src/scss/ui/_buttons.scss
@@ -65,8 +65,8 @@
 // Button color variations
 //
 .btn-white {
-  //--#{$prefix}btn-bg: var(--#{$prefix}card-bg);
-  //--#{$prefix}btn-hover-bg: var(--#{$prefix}card-bg);
+  --#{$prefix}btn-bg: var(--#{$prefix}card-bg);
+  --#{$prefix}btn-hover-bg: var(--#{$prefix}card-bg-hover);
 }
 
 @each $color, $value in $theme-colors {
diff --git a/src/scss/ui/_cards.scss b/src/scss/ui/_cards.scss
index 1c7e6413..9bf3195d 100644
--- a/src/scss/ui/_cards.scss
+++ b/src/scss/ui/_cards.scss
@@ -1,7 +1,7 @@
 .card {
   --#{$prefix}card-border-radius: var(--#{$prefix}border-radius);
-  --#{$prefix}card-bg: var(--#{$prefix}body-bg);
-  --#{$prefix}card-color: var(--#{$prefix}body-color);
+  --#{$prefix}card-bg: var(--#{$prefix}card-bg);
+  --#{$prefix}card-color: var(--#{$prefix}card-color);
 
   box-shadow: $card-shadow;
   border: $card-border-width solid $card-border-color;
-- 
GitLab