From 9cce26c4f09da96593f624d7a2fd191969feccd8 Mon Sep 17 00:00:00 2001
From: mkpaz <quizynox@gmail.com>
Date: Mon, 29 Aug 2022 11:11:52 +0400
Subject: [PATCH] Use 'subtle' color instead of 'inset' for controls

---
 styles/src/components/_button.scss     | 2 +-
 styles/src/components/_data.scss       | 4 ++--
 styles/src/components/_menu.scss       | 2 +-
 styles/src/components/_pagination.scss | 2 +-
 styles/src/components/_spinner.scss    | 2 +-
 styles/src/components/_tab-pane.scss   | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/styles/src/components/_button.scss b/styles/src/components/_button.scss
index c7a60ed..faec812 100755
--- a/styles/src/components/_button.scss
+++ b/styles/src/components/_button.scss
@@ -8,7 +8,7 @@
 @mixin base() {
 
   // buttons can be configured via looked-up colors
-  -color-button-bg:          -color-bg-inset;
+  -color-button-bg:          -color-bg-subtle;
   -color-button-fg:          -color-fg-default;
   -color-button-border:      -color-border-default;
 
diff --git a/styles/src/components/_data.scss b/styles/src/components/_data.scss
index b3d4257..932688f 100755
--- a/styles/src/components/_data.scss
+++ b/styles/src/components/_data.scss
@@ -21,7 +21,7 @@ $tree-cell-indent: 1em !default;
   -color-cell-fg:          -color-fg-default;
   -color-cell-bg-selected: -color-accent-subtle;
   -color-cell-fg-selected: -color-fg-default;
-  -color-cell-bg-odd:      -color-bg-inset;
+  -color-cell-bg-odd:      -color-bg-subtle;
   -color-cell-border:      -color-border-default;
 
   -fx-border-color: -color-cell-border;
@@ -160,7 +160,7 @@ $tree-cell-indent: 1em !default;
 
   @include _base();
 
-  -color-header-bg: -color-bg-inset;
+  -color-header-bg: -color-bg-subtle;
   -color-header-fg: -color-fg-default;
 
   &.bordered {
diff --git a/styles/src/components/_menu.scss b/styles/src/components/_menu.scss
index 7a94b83..4ecdca5 100755
--- a/styles/src/components/_menu.scss
+++ b/styles/src/components/_menu.scss
@@ -159,7 +159,7 @@ $separator-padding:       map-get(cfg.$separators, "small") !default;
   -fx-background-insets: 0, 1;
   -fx-padding: cfg.$popup-padding-y cfg.$popup-padding-x cfg.$popup-padding-y cfg.$popup-padding-x;
   -fx-background-radius: cfg.$border-radius;
-  @include effects.shadow(-color-bg-inset, cfg.$popup-shadow);
+  @include effects.shadow($color-menuitem-bg, cfg.$popup-shadow);
 
   // no idea what's that thing and how to trigger its appearance
   >.scroll-arrow {
diff --git a/styles/src/components/_pagination.scss b/styles/src/components/_pagination.scss
index eaae417..741abd2 100755
--- a/styles/src/components/_pagination.scss
+++ b/styles/src/components/_pagination.scss
@@ -66,7 +66,7 @@
 
         >.bullet-button {
           -fx-background-radius: 0, 10em, 10em;
-          -fx-background-color: transparent, -color-border-default, -color-bg-inset;
+          -fx-background-color: transparent, -color-border-default, -color-bg-subtle;
           -fx-background-insets: 0, 5, 6;
 
           &:selected {
diff --git a/styles/src/components/_spinner.scss b/styles/src/components/_spinner.scss
index d972653..4d9d348 100755
--- a/styles/src/components/_spinner.scss
+++ b/styles/src/components/_spinner.scss
@@ -4,7 +4,7 @@
 @use "../settings/icons";
 @use "../settings/utils";
 
-$button-bg:       -color-bg-inset   !default;
+$button-bg:       -color-bg-subtle   !default;
 $button-fg:       -color-fg-default !default;
 $button-hover:    utils.saturate($button-bg, cfg.$darkMode, cfg.$color-delta-hover) !default;
 $icon-padding-x:  0.25em !default;
diff --git a/styles/src/components/_tab-pane.scss b/styles/src/components/_tab-pane.scss
index b3f0827..9a54948 100755
--- a/styles/src/components/_tab-pane.scss
+++ b/styles/src/components/_tab-pane.scss
@@ -60,7 +60,7 @@ $border-width:  2px   !default;
       }
 
       &:hover {
-        -fx-background-color: -color-border-default, -color-bg-inset;
+        -fx-background-color: -color-border-default, -color-bg-subtle;
       }
 
       &:top:selected,
@@ -115,7 +115,7 @@ $border-width:  2px   !default;
         }
 
         &:selected {
-          -fx-background-color: -color-bg-inset;
+          -fx-background-color: -color-bg-subtle;
 
           >.tab-container {
             >.tab-label {