Some minor adjustment on waybar configs and styles

7 files changed, 87 insertions, 47 deletions

diff --git a/config/waybar/configs/Peony [Bottom] b/config/waybar/configs/Peony [Bottom]
index 8406c302..7f049c18 100644
--- a/config/waybar/configs/Peony [Bottom]
+++ b/config/waybar/configs/Peony [Bottom]
@@ -24,13 +24,14 @@
 "modules-center": ["clock#peony"], 
 	
 "modules-right": [
-	"pulseaudio",
-	"custom/separator#line",
+	"battery#peony",
+	"custom/separator#blank",
 	"backlight#peony",
-	"custom/separator#line",
+	"custom/separator#blank",
+	"pulseaudio",
+	"custom/separator#blank",
 	"temperature",
-	"custom/separator#line",
-	"battery#peony",
+	"custom/separator#blank",	
 	"network#peony"],
 
 
diff --git a/config/waybar/configs/Peony [TOP] b/config/waybar/configs/Peony [TOP]
index 037d05ad..83ec43f5 100644
--- a/config/waybar/configs/Peony [TOP]
+++ b/config/waybar/configs/Peony [TOP]
@@ -24,13 +24,14 @@
 "modules-center": ["clock#peony"], 
 	
 "modules-right": [
-	"pulseaudio",
-	"custom/separator#line",
+	"battery#peony",
+	"custom/separator#blank",
 	"backlight#peony",
-	"custom/separator#line",
+	"custom/separator#blank",
+	"pulseaudio",
+	"custom/separator#blank",
 	"temperature",
-	"custom/separator#line",
-	"battery#peony",
+	"custom/separator#blank",	
 	"network#peony"],
 
 
diff --git a/config/waybar/style/Monochrome Contrast.css b/config/waybar/style/Monochrome Contrast.css
index 11286633..2283a0ed 100644
--- a/config/waybar/style/Monochrome Contrast.css
+++ b/config/waybar/style/Monochrome Contrast.css
@@ -211,6 +211,7 @@ tooltip label{
 	min-width: 80px;
 	min-height: 5px;
 	border-radius: 5px;
+	background-color: grey;
 }
 
 #pulseaudio-slider highlight {
diff --git a/config/waybar/style/Obsidian Glow.css b/config/waybar/style/Obsidian Glow.css
index dad6a1e0..26f4b1df 100644
--- a/config/waybar/style/Obsidian Glow.css
+++ b/config/waybar/style/Obsidian Glow.css
@@ -180,7 +180,7 @@ tooltip label {
 	min-width: 80px;  
 	min-height: 5px; 
 	border-radius: 5px;
-	background-color: #22252a;
+	background-color: grey;
 }
 	
 #pulseaudio-slider highlight {
@@ -202,7 +202,7 @@ tooltip label {
 	min-width: 80px;  
 	min-height: 10px; 
 	border-radius: 5px;
-	background-color: #22252a;
+	background-color: grey;
 }
 	
 #backlight-slider highlight {
diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css
index 314f806a..6ae762ed 100644
--- a/config/waybar/style/Purpl.css
+++ b/config/waybar/style/Purpl.css
@@ -215,7 +215,7 @@ tooltip {
 	min-width: 80px;
 	min-height: 5px;
 	border-radius: 5px;
-	background-color: #22252a;
+	background-color: #6E6A86;
 }
 
 #pulseaudio-slider highlight {
@@ -237,7 +237,7 @@ tooltip {
 	min-width: 80px;
 	min-height: 10px;
 	border-radius: 5px;
-	background-color: #22252a;
+	background-color: #6E6A86;
 }
 
 #backlight-slider highlight {
diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css
index 4db6a96c..9c76474f 100644
--- a/config/waybar/style/Rose Pine.css
+++ b/config/waybar/style/Rose Pine.css
@@ -12,7 +12,8 @@
 
 * {
 	font-family: "JetBrainsMono Nerd Font";
-	font-weight: bold;	
+	font-weight: bold;
+	min-height: 0;	
 	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
 	font-size: 96%;
 	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
diff --git a/config/waybar/style/Simple Style.css b/config/waybar/style/Simple Style.css
index 23a642fc..311b0caf 100644
--- a/config/waybar/style/Simple Style.css
+++ b/config/waybar/style/Simple Style.css
@@ -26,47 +26,19 @@ window#waybar {
 
 #workspaces button {
   padding: 0 10px;
-  background: transparent;
   color: @foreground;
-  border-top: 3px solid @background;
 }
 
 #workspaces button.active {
-  border-bottom: 3px solid @green;
+  border-bottom: 1px solid @green;
 }
 
 #workspaces button.urgent {
-  border-bottom: 3px solid @yellow;
+  border-bottom: 2px solid @yellow;
 }
 
 #submap {
-  border-bottom: 3px solid @red;
-}
-
-#battery.warning,
-#disk.warning,
-#memory.warning,
-#cpu.warning {
-  border-top: 3px solid @background;
-  border-bottom: 3px solid @yellow;
-}
-
-#battery.critical,
-#disk.critical,
-#memory.critical,
-#cpu.critical,
-#custom-recording {
-  border-top: 3px solid @background;
-  border-bottom: 3px solid @red;
-}
-
-#battery.charging {
-  border-top: 3px solid @background;
-  border-bottom: 3px solid @green;
-}
-
-#tray {
-  margin-left: -1000000px;
+  border-bottom: 1px solid @red;
 }
 
 #backlight,
@@ -116,5 +88,69 @@ window#waybar {
 #custom-weather.sunnyDay {
   color: @foreground;
   padding: 0 6px;
-  margin: 0 6px;
+}
+
+#battery.warning,
+#disk.warning,
+#memory.warning,
+#cpu.warning {
+  border-top: 3px solid @background;
+  border-bottom: 3px solid @yellow;
+}
+
+#battery.critical,
+#disk.critical,
+#memory.critical,
+#cpu.critical {
+  border-top: 3px solid @background;
+  border-bottom: 3px solid @red;
+}
+
+#battery.charging {
+  border-top: 3px solid @background;
+  border-bottom: 3px solid @green;
+}
+
+#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+	
+#pulseaudio-slider trough {
+	min-width: 80px;  
+	min-height: 5px; 
+	border-radius: 5px;
+	background-color: @dim;
+}
+	
+#pulseaudio-slider highlight {
+	min-height: 10px; 
+	border-radius: 5px;
+	background-color: @green;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+	
+#backlight-slider trough {
+	min-width: 80px;  
+	min-height: 10px; 
+	border-radius: 5px;
+	background-color: @dim;
+}
+	
+#backlight-slider highlight {
+	min-width: 10px; 
+	border-radius: 5px;
+	background-color: @green;
 }