Impreza

modules/user/packages/drvs/ags/.gitignore

@@ -1,2 +0,0 @@
-accent.css
-colors.scss

modules/user/packages/drvs/ags/style.scss

@@ -3,23 +3,17 @@
 
 $radius: 10px;
 
-* {
-    all: unset;
-}
-
 %item {
+    all: unset;
     background: $bg;
     border-radius: $radius;
-    padding: 6px 8px;
+    padding: 4px;
 
-    & + &, .item + &, & + .item  { margin-left: 4px; }
+    & + &, .item + & { margin-left: 4px; }
 
-    icon + label { margin-left: 4px; }
+    label { margin: 0 8px; }
 }
 
-.item + .item { margin-left: 4px; }
-
-
 window.Bar {
     border: none;
     box-shadow: none;
@@ -34,6 +28,8 @@ window.Bar {
 
     .Workspaces  {
         button {
+            all: unset;
+
             &:hover label {
                 background: $surface0;
                 color: $accent;
@@ -63,12 +59,12 @@ window.Bar {
     .Layout.en { color: $accent; }
 
     .SysTray button {
-        padding: 4px;
+        all: unset;
+        padding: 8px;
         border-radius: inherit;
 
         &:hover {
             background: $surface0;
-            border-radius: 4px;
         }
     }
 
@@ -86,17 +82,16 @@ window.Bar {
         }
     }
 
+    .Battery label {
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .Time { padding: 0 8px; }
+
+    .AudioSlider icon { margin-left: 8px; }
+
     .Workspaces, .Wifi, .Layout, .Media, .SysTray, .AudioSlider, .Battery, .Time {
         @extend %item;
     }
-
-    .Wifi, .AudioSlider {
-        &, button {
-            &:hover { background-color: $surface0; }
-            &:active {
-                background-color: $accent;
-                color: $bg;
-            }
-        }
-    }
 }

modules/user/packages/drvs/ags/widget/elements/Wifi.tsx

@@ -6,9 +6,7 @@ export default function Wifi() {
     const network = Network.get_default()
     const wifi = bind(network, "wifi")
 
-    return <box
+    return <box visible={wifi.as(Boolean)}>
-            visible={wifi.as(Boolean)}
-            className="item">
         {wifi.as(wifi => wifi && (
             <button
                 className="Wifi"