Merge branch 'master' of gitea.suda.codes:sudacode/waybar

catppuccin-macchiato/style.css

@@ -2,9 +2,7 @@
 
 * {
   border: none;
-  font-family:
-    JetBrainsMono Nerd Font,
-    Font Awesome;
+  font-family: "JetBrainsMono Nerd Font", "Font Awesome", "Noto Sans CJK JP";
   font-size: 13px;
   min-height: 0;
   border-radius: 0.69em;
@@ -20,6 +18,12 @@ window#waybar.hidden {
   opacity: 0.2;
 }
 
+#window {
+  background-color: inherit;
+  padding: 0 10px;
+  margin: 5px 1px;
+}
+
 tooltip {
   background-color: @base;
   border: 1px solid @subtext0;
@@ -85,7 +89,7 @@ button:hover {
   background-image: linear-gradient(0deg, @surface1, @mantle);
 }
 
-#mode {
+#submap {
   background-color: @base;
   box-shadow: inset 0 -2px @text;
 }
@@ -103,7 +107,7 @@ button:hover {
 #custom-kernel,
 #idle_inhibitor,
 #scratchpad,
-#mode,
+#submap,
 #tray {
   padding: 0 10px;
   margin: 5px 1px;
@@ -125,7 +129,7 @@ button:hover {
 }
 
 #custom-kernel {
-  background-color: @rosewater;
+  background-color: @mauve;
   color: @mantle;
 }
 
@@ -167,7 +171,7 @@ label:focus {
 }
 
 #network.disconnected {
-  background-color: red;
+  background-color: @red;
   color: @mantle;
 }
 
@@ -178,7 +182,7 @@ label:focus {
 }
 
 #pulseaudio {
-  background-color: @yellow;
+  background-color: @sapphire;
   color: @mantle;
 }
 
@@ -201,8 +205,8 @@ label:focus {
 
 #tray {
   /* background-color: @overlay0; */
-  background-color: @surface1;
-  color: @text;
+  background-color: @surface0;
+  color: @mantle;
 }
 
 #tray > .passive {
@@ -240,15 +244,15 @@ label:focus {
   color: #1793d1;
 }
 
-#custom-mpv-scroll {
-  color: @base;
-  background-color: @blue;
+#custom-mpd-scroll {
+  color: @mantle;
+  background-color: @mauve;
   padding: 0 10px;
   margin: 5px 1px;
 }
 #custom-updates {
   background-color: @yellow;
-  color: @base;
+  color: @mantle;
   padding: 0 10px;
   margin: 5px 1px;
 }
@@ -260,8 +264,15 @@ label:focus {
 }
 
 #custom-firefox {
-  color: @base;
-  background-color: @pink;
+  color: @mantle;
+  background-color: @peach;
+  padding: 0 10px;
+  margin: 5px 1px;
+}
+
+#cava {
+  background-color: @blue;
+  color: @crust;
   padding: 0 10px;
   margin: 5px 1px;
 }