diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix index 8d132b7..9aa65c1 100644 --- a/modules/home/waybar.nix +++ b/modules/home/waybar.nix @@ -162,7 +162,10 @@ let # normal tiling. Keep in sync with the whole-swap jsoncs (parity rule). layer = "bottom"; position = "top"; - height = 34; + # 36, not 34: the active-workspace pill is inset 3px top+bottom (CSS + # below) so it can never overhang the bar's border — the extra height + # keeps the pill's text from cramping inside the inset (#152). + height = 36; margin-top = t.ui.gapsOut; margin-left = t.ui.gapsOut; margin-right = t.ui.gapsOut; @@ -428,8 +431,12 @@ let 2.0, gated by tools/check-theme-contrast.py) — the palettes that once made it vanish (gruvbox muted≈base, item 27) were retuned. Secondary-but-not-dim stays alpha(@text, 0.85). */ + /* 3px vertical margin insets the active pill INSIDE the bar — without + it the filled button spans the bar's full inner height and visually + overhangs the rounded border (#152). */ #workspaces button { padding: 0 8px; + margin: 3px 0; color: @muted; border-radius: ${toString t.ui.rounding}px; } @@ -458,7 +465,10 @@ let color: @accent; font-family: Nomarchy; font-size: ${toString (t.fonts.size + 4)}pt; - padding: 0 10px; + /* Wider outer padding: the bar's rounded corner curves into the + end module's box, so the edge glyphs need more room than the + uniform 10px or they look cramped (#152; power button mirrors). */ + padding: 0 10px 0 14px; } #custom-nomarchy:hover { color: @accentAlt; } @@ -466,6 +476,7 @@ let color: alpha(@text, 0.85); padding: 0 10px; } + #custom-powermenu { padding: 0 16px 0 10px; } #custom-powermenu:hover { color: @bad; } /* Group rhythm (item 28c): a wider breath before each functional