From 3c48cbff6fcc48b56acfc560afbac7206ef58f05 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Sun, 2 Feb 2020 12:53:35 +1000
Subject: [PATCH] more contrast on buttons and scrollbars

---
 qt/aqt/theme.py          | 10 ++++++++--
 qt/ts/scss/_buttons.scss |  6 ++++--
 qt/ts/scss/_vars.scss    | 11 ++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/qt/aqt/theme.py b/qt/aqt/theme.py
index 1eb1812d7..102780f73 100644
--- a/qt/aqt/theme.py
+++ b/qt/aqt/theme.py
@@ -144,7 +144,12 @@ QScrollBar::sub-line {
       border: none;
       background: none;
 }
-""" % (self.str_color("window-bg"), colors.get("fusion-button-hover-bg"))
+
+QTabWidget { background-color: %s; }
+""" % (self.str_color("window-bg"),
+       colors.get("fusion-button-hover-bg"),
+       self.str_color("window-bg")
+       )
 
         # allow addons to modify the styling
         buf = gui_hooks.style_did_init(buf)
@@ -174,7 +179,8 @@ QScrollBar::sub-line {
         window_bg = self.qcolor("window-bg")
         palette.setColor(QPalette.Window, window_bg)
         palette.setColor(QPalette.AlternateBase, window_bg)
-        palette.setColor(QPalette.Button, window_bg)
+
+        palette.setColor(QPalette.Button, QColor(colors.get("fusion-button-base-bg")))
 
         frame_bg = self.qcolor("frame-bg")
         palette.setColor(QPalette.Base, frame_bg)
diff --git a/qt/ts/scss/_buttons.scss b/qt/ts/scss/_buttons.scss
index 356e88a6b..4324c5968 100644
--- a/qt/ts/scss/_buttons.scss
+++ b/qt/ts/scss/_buttons.scss
@@ -35,8 +35,10 @@
     box-shadow: 0 0 3px vars.$fusion-button-outline;
     border: 1px solid vars.$fusion-button-border;
 
-    border-radius: 3px;
-    padding: 5px;
+    border-radius: 2px;
+    padding: 10px;
+    padding-top: 3px;
+    padding-bottom: 3px;
   }
 
   button:hover {
diff --git a/qt/ts/scss/_vars.scss b/qt/ts/scss/_vars.scss
index 3541f9226..7f31f2814 100644
--- a/qt/ts/scss/_vars.scss
+++ b/qt/ts/scss/_vars.scss
@@ -41,8 +41,9 @@ $night-suspended-bg: #aaaa33;
 $night-marked-bg: #77c;
 
 /* night-mode-specific colours */
-$fusion-button-gradient-start: #363636;
-$fusion-button-gradient-end: #404040;
-$fusion-button-outline: #000;
-$fusion-button-hover-bg: #454545;
-$fusion-button-border: #444;
+$fusion-button-gradient-start: #555555;
+$fusion-button-gradient-end: #656565;
+$fusion-button-outline: #222222;
+$fusion-button-hover-bg: #656565;
+$fusion-button-border: #646464;
+$fusion-button-base-bg: #454545;
\ No newline at end of file