From e3592f01696b1776aa714c09931e8e394600baed Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <fufexan@protonmail.com>
Date: Mon, 25 Sep 2023 23:22:38 +0300
Subject: [PATCH] eww: more style updates

---
 home/programs/eww/css/general.scss         |  5 +++--
 home/programs/eww/css/music.scss           |  6 +++---
 home/programs/eww/css/osd.scss             |  9 ---------
 home/programs/eww/css/system-menu.scss     | 18 +++++++++---------
 home/programs/eww/windows/osd.yuck         |  2 +-
 home/programs/eww/windows/system-menu.yuck |  4 ++--
 6 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/home/programs/eww/css/general.scss b/home/programs/eww/css/general.scss
index d2f446f5..8154f219 100644
--- a/home/programs/eww/css/general.scss
+++ b/home/programs/eww/css/general.scss
@@ -44,7 +44,7 @@ $border-width: 2px;
 }
 
 tooltip {
-  background: $bg;
+  background: $base;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 rgba(0, 0, 0, .4);
   border-radius: $round;
 }
@@ -67,6 +67,7 @@ scale {
   }
 
   highlight {
+    background: rgba(255, 255, 255, .7);
     border-radius: $scaleh;
     margin: 0 calc(0px - $scaleh / 2);
     min-height: $scaleh;
@@ -76,7 +77,7 @@ scale {
 .button {
   background: rgba(255, 255, 255, .2);
   border-radius: 100%;
-  padding: .4rem .5rem; /* general for icons */
+  padding: .2rem .4rem; /* general for icons */
 
   &:hover {
     background: rgba(255, 255, 255, .25);
diff --git a/home/programs/eww/css/music.scss b/home/programs/eww/css/music.scss
index fd200264..0ae38185 100644
--- a/home/programs/eww/css/music.scss
+++ b/home/programs/eww/css/music.scss
@@ -23,8 +23,8 @@
 
   .cover {
     box-shadow: 0 1px 2px -1px $bg;
-    min-height: 13rem;
-    min-width: 13rem;
+    min-height: 12rem;
+    min-width: 12rem;
   }
 }
 
@@ -36,7 +36,7 @@
   }
 
   .artist {
-    margin: 1rem;
+    margin: .7rem;
   }
 
   .buttons {
diff --git a/home/programs/eww/css/osd.scss b/home/programs/eww/css/osd.scss
index f9e247cb..674e5dd5 100644
--- a/home/programs/eww/css/osd.scss
+++ b/home/programs/eww/css/osd.scss
@@ -12,12 +12,3 @@
     min-width: 8rem;
   }
 }
-
-/* scale highlight gradients for volume & brightness */
-.osd-volume highlight {
-  background-image: linear-gradient(to top, $teal, $sky);
-}
-
-.osd-brightness highlight {
-  background-image: linear-gradient(to top, $yellow, $peach);
-}
diff --git a/home/programs/eww/css/system-menu.scss b/home/programs/eww/css/system-menu.scss
index ac310613..94339e83 100644
--- a/home/programs/eww/css/system-menu.scss
+++ b/home/programs/eww/css/system-menu.scss
@@ -20,8 +20,12 @@
 
   &.enabled button,
   &.connected button {
-    background: $blue;
+    background: white;
     .icon { color: black; }
+
+    &:hover {
+      background: rgba(255, 255, 255, .25);
+    }
   }
 }
 
@@ -39,14 +43,6 @@
   .icon {
     margin: 0 .3rem;
   }
-
-  .volume highlight {
-    background-image: linear-gradient(to right, $teal, $sky);
-  }
-
-  .brightness highlight {
-    background-image: linear-gradient(to right, $yellow, $peach);
-  }
 }
 
 /* battery & power button */
@@ -61,3 +57,7 @@
   .rate { color: #ccc; }
   .status { margin: 0 .5rem; }
 }
+
+.button.power {
+  margin: .1rem;
+}
diff --git a/home/programs/eww/windows/osd.yuck b/home/programs/eww/windows/osd.yuck
index b11bcd62..9c9623dd 100644
--- a/home/programs/eww/windows/osd.yuck
+++ b/home/programs/eww/windows/osd.yuck
@@ -4,7 +4,7 @@
     :class "osd-part osd-${class}"
     :space-evenly false
     (label
-      :class "text"
+      :class "icon"
       :text icon)
     (scale
       :value value)))
diff --git a/home/programs/eww/windows/system-menu.yuck b/home/programs/eww/windows/system-menu.yuck
index a7ec1f2e..4862b423 100644
--- a/home/programs/eww/windows/system-menu.yuck
+++ b/home/programs/eww/windows/system-menu.yuck
@@ -84,8 +84,8 @@
       (box
         :hexpand true)
       (button
-        :class "button"
-        :onclick "wlogout -p layer-shell &"
+        :class "button power"
+        :onclick "wlogout -p layer-shell & eww close system-menu"
         (label
           :class "icon"
           :text "")))))