1 files changed, 22 insertions, 33 deletions

diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 0d159fd..67b5e77 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,43 +1,32 @@
-* {
-    font-family: "JetBrains Mono", "Font Awesome 6 Pro", monospace;
-    font-size: 13.5px;
-    transition: none;
-    margin: 0;
-    padding: 0;
-}
+/** Base */
 
 window#waybar {
+    font-family: "JetBrains Mono", "Font Awesome 6 Pro", monospace;
+    font-size: 13.5px;
+    color: #c7c6c3;
     background-color: transparent;
 }
 
 window#waybar > box {
     margin: 10px;
     margin-bottom: 0px;
-    padding: 0;
-    color: #c7c6c3;
-}
-
-button {
-    border: none;
-    border-radius: 0;
 }
 
 .modules-left,
 .modules-right {
-    margin: 0;
     padding: 2px 0px;
     background-color: #14171d;
     border-radius: 4px;
 }
 
+/** Workspaces */
+
 #workspaces {
-    padding: 0px 0px;
+    margin-left: 2px;
 }
 
 #workspaces button {
     all: initial;
-    box-shadow: inherit;
-    text-shadow: inherit;
     color: #c7c6c3;
     background-color: transparent;
     border-radius: 4px;
@@ -58,6 +47,17 @@ button {
     background-color: #cc5c5c;
 }
 
+/** Window */
+
+window#waybar:not(.empty) #window {
+    padding: 0 10px;
+    border-left: 1px solid #4d4754;
+    color: #c7c6c3;
+    margin: 0 2px;
+}
+
+/** Tray */
+
 #clock,
 #battery,
 #cpu,
@@ -84,15 +84,12 @@ button {
     border: none;
 }
 
-#window {
-    padding: 0 10px;
-    border-left: 1px solid #4d4754;
-    color: #c7c6c3;
+#tray > .passive {
+    -gtk-icon-effect: dim;
 }
 
-#window,
-#workspaces {
-    margin: 0 4px;
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
 }
 
 #battery {
@@ -140,11 +137,3 @@ button {
 #temperature.critical {
     color: #cc5c5c;
 }
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-}