diff --git a/de/home/.config/eww/eww.scss b/de/home/.config/eww/eww.scss index f95efdd..f7700c2 100644 --- a/de/home/.config/eww/eww.scss +++ b/de/home/.config/eww/eww.scss @@ -25,13 +25,16 @@ margin: 10px 0px 10px 5px; min-width: 25px; } -scale trough { +scale trough, +progressbar>trough { background-color: $color1; + color: $color1; min-width: 100px; min-height: 10px; border-radius: 4px; } -scale trough highlight { +scale trough highlight, +progressbar>trough>progress { background-color: $color2; border-radius: 4px; } diff --git a/de/home/.config/eww/eww.yuck b/de/home/.config/eww/eww.yuck index e8af2d8..f6bef59 100644 --- a/de/home/.config/eww/eww.yuck +++ b/de/home/.config/eww/eww.yuck @@ -192,7 +192,7 @@ :revealvar reveal_battery :revealvar-name "reveal_battery" (button :onclick 'pavucontrol-qt --tab 3' - " ${EWW_BATTERY.BAT0.status}%") + {(EWW_BATTERY.BAT0.status == "Charging") ? " ${EWW_BATTERY.BAT0.capacity}%" : " ${EWW_BATTERY.BAT0.capacity}%"}) (battery_children))) (defpoll battery_level :initial 0 @@ -203,9 +203,7 @@ :orientation "h" :space-evenly false :halign "center" - (scale - :min 0 - :max 100 + (progress :value {EWW_BATTERY.BAT0.capacity} :orientation "h")))