From 36ee4d46a6c816fb192a8f922382d066a279ffb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Dias?= <joaovodias@gmail.com>
Date: Sun, 4 Aug 2024 11:18:58 -0300
Subject: [PATCH] :lipstick: modify colors, new widget

---
 waybar/{mocha.css => _colors.css} |  58 ++++++++-------
 waybar/style.css                  | 118 +++++++-----------------------
 2 files changed, 58 insertions(+), 118 deletions(-)
 rename waybar/{mocha.css => _colors.css} (75%)

diff --git a/waybar/mocha.css b/waybar/_colors.css
similarity index 75%
rename from waybar/mocha.css
rename to waybar/_colors.css
index 75cfb9d..60dd4ec 100644
--- a/waybar/mocha.css
+++ b/waybar/_colors.css
@@ -1,26 +1,32 @@
-@define-color rosewater #f5e0dc;
-@define-color flamingo #f2cdcd;
-@define-color pink #f5c2e7;
-@define-color mauve #cba6f7;
-@define-color red #f38ba8;
-@define-color maroon #eba0ac;
-@define-color peach #fab387;
-@define-color yellow #f9e2af;
-@define-color green #a6e3a1;
-@define-color teal #94e2d5;
-@define-color sky #89dceb;
-@define-color sapphire #74c7ec;
-@define-color blue #89b4fa;
-@define-color lavender #b4befe;
-@define-color text #cdd6f4;
-@define-color subtext1 #bac2de;
-@define-color subtext0 #a6adc8;
-@define-color overlay2 #9399b2;
-@define-color overlay1 #7f849c;
-@define-color overlay0 #6c7086;
-@define-color surface2 #585b70;
-@define-color surface1 #45475a;
-@define-color surface0 #313244;
-@define-color base #1e1e2e;
-@define-color mantle #181825;
-@define-color crust #11111b;
+@define-color rosewater #f5e0dc;
+@define-color flamingo #f2cdcd;
+@define-color pink #f5c2e7;
+@define-color mauve #cba6f7;
+@define-color red #f38ba8;
+@define-color maroon #eba0ac;
+@define-color peach #fab387;
+@define-color yellow alpha(#f9e2af, .8);
+@define-color green #a6e3a1;
+@define-color teal #94e2d5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color blue #89b4fa;
+@define-color lavender #b4befe;
+@define-color text #cdd6f4;
+@define-color subtext1 #bac2de;
+@define-color subtext0 #a6adc8;
+@define-color overlay2 #9399b2;
+@define-color overlay1 #7f849c;
+@define-color overlay0 #6c7086;
+@define-color surface2 #585b70;
+@define-color surface1 #45475a;
+@define-color surface0 #313244;
+@define-color base #1e1e2e;
+@define-color mantle #181825;
+@define-color crust #11111b;
+
+@define-color background alpha(@base, .6);
+@define-color bar shade(@yellow, .2);
+@define-color hover shade(@yellow, .5);
+@define-color active shade(@yellow, .55);
+@define-color highlight shade(@yellow, .4);
diff --git a/waybar/style.css b/waybar/style.css
index f1a0f2c..cc27614 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,7 +1,5 @@
 
-@import "mocha.css";
-
-@define-color hover shade(@blue, .5);
+@import "_colors.css";
 
 * {
     color: @text;
@@ -21,10 +19,7 @@ window > * {
     margin-left: 4px;
     margin-right: 4px;
     padding: 2px;
-}
-
-window > * {
-    background: alpha(@base, .8);
+    background: @bar;
 }
 
 window#waybar {
@@ -32,32 +27,15 @@ window#waybar {
 }
 
 window#waybar.hidden {
-    opacity: .1;
+    opacity: 0;
 }
 
-/*window#waybar.empty {
-    background-color: transparent;
-}
-window#waybar.solo {
-    background-color: #FFFFFF;
-}
-window#waybar.termite {
-    background-color: alpha(@base, .1);
-}
-window#waybar.chromium {
-    background-color: @base;
-}*/
-
 button {
-    /* Use box-shadow instead of border so the text isn't offset */
-    /*box-shadow: inset 0 -3px transparent;*/
-    /* Avoid rounded borders under each button name */
     border: none;
-    background: alpha(@base, .3);
+    background: @background;
     transition: 120ms ease-in;
 }
 
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 button:hover {
     background-color: @hover;
 }
@@ -90,15 +68,24 @@ widget > *:hover:not(#window):not(#workspaces):not(#tray):not(#custom-media) {
     color: @text;
     background: transparent;
     font-size: 19px;
-    border-radius: 16px; 
+    border-radius: 16px;
 }
 
-#workspaces button *:hover {
-    background: @base;
+#workspaces button label {
+    margin-top: .2px;
+    margin-left: .1px;
+}
+
+#workspaces button:hover {
+    background: @hover;
 }
 
 #workspaces button.active {
-    background: alpha(shade(@blue, .5), .6);
+    background: @active;
+}
+
+#workspaces button.active label {
+    margin-right: 1px;
 }
 
 #workspaces button.urgent {
@@ -106,16 +93,11 @@ widget > *:hover:not(#window):not(#workspaces):not(#tray):not(#custom-media) {
 }
 
 #custom-notifications {
-    background: alpha(@base, .3);
     font-size: 16px;
     padding-left: 10px;
     padding-right: 12px;
 }
 
-#custom-notifications:hover {
-    background: alpha(@blue, .5);
-}
-
 #clock,
 #battery,
 #cpu,
@@ -142,13 +124,11 @@ widget > *:hover:not(#window):not(#workspaces):not(#tray):not(#custom-media) {
 #workspaces {}
 */
 
-#clock {
-    background-color: alpha(@base, .3);
-}
-
-#battery {
-    background-color: alpha(@base, .3);
-    color: @text;
+@keyframes blink {
+    to {
+        background-color: alpha(@crust, .3);
+        color: @orange;
+    }
 }
 
 #battery.charging, #battery.plugged {
@@ -160,13 +140,6 @@ widget > *:hover:not(#window):not(#workspaces):not(#tray):not(#custom-media) {
     background-color: alpha(@blue, .35);
 }
 
-@keyframes blink {
-    to {
-        background-color: alpha(@crust, .3);
-        color: @orange;
-    }
-}
-
 /* Using steps() instead of linear as a timing function to limit cpu usage */
 #battery.critical:not(.charging) {
     background-color: alpha(shade(@orange, 0.5), .3);
@@ -178,53 +151,18 @@ widget > *:hover:not(#window):not(#workspaces):not(#tray):not(#custom-media) {
     animation-direction: alternate;
 }
 
-label:focus {
-    background-color: shade(@blue, 0.4);
+#custom-media {
+    background: @highlight;
 }
 
-#cpu {
-    background-color: @base;
-    color: @text;
-}
-
-#memory {
-    background-color: @base;
-}
-
-#disk {
-    background-color: @base;
-}
-
-#pulseaudio {
-    background-color: alpha(@base, .3);
-    color: @text;
-}
-
-#wireplumber {
-    background-color: alpha(@base, .3);
-    color: @text;
-}
-
-#custom-media.custom-spotify {
-    background-color: alpha(shade(@green, .65), .3);
-}
-
-#custom-media.custom-spotify:hover {
-    background: alpha(@green, .3);
-}
-
-#temperature {
-    background-color: alpha(@base, .3);
+#custom-media:hover {
+    background: @hover;
 }
 
 #temperature.critical {
     background-color: alpha(@red, .3);
 }
 
-#tray {
-    background-color: alpha(@base, .3);
-}
-
 #tray > .passive {
     -gtk-icon-effect: dim;
 }
@@ -234,10 +172,6 @@ label:focus {
     background: alpha(@orange, .3);
 }
 
-#scratchpad {
-    background: alpha(@base, .3);
-}
-
 #scratchpad.empty {
     background-color: transparent;
 }