darmanandClaude Opus 5
b16cc93ff6
The shell was running two unrelated palettes: an amber one (#FFD063 accent, #EEEEEE text, #0F1012 panels) hardcoded as ~200 raw hex literals across the launchers, sidebar, systray, vitals and notifications, and an orange one (#e8722a) that only the dense bar had, tokenized as per-file properties. This unifies on the ORANGE values under the AMBER naming scheme, and moves the lot into widgets/theme/Theme.qml. `surface` takes the dense bar's void (#0a0a0a) rather than the old panel background. Zero color and font literals remain anywhere under widgets/ outside Theme.qml. Collisions resolved, all near-duplicates that wanted to be one token: - #0F1012 + #0A0A0C + #0a0a0a -> surface - #EEEEEE + #dedede -> text - #7A7B7D + #858585 -> muted - #292C30 + #22262C -> raised - #FFD063 + #e8722a -> accent Two derived things rather than literals. accentSoft (the pale flash the top/bottom bars show while a launcher is open) was a hand-picked #FFF3C0 against amber, which is simply wrong against orange; it is now Qt.tint(accent, white 55%), a ratio checked against the original (amber tinted 55% gives #FFE9B8 vs the hand-picked #FFF3C0). And the dense bar had been hand-encoding Qt.rgba(0.87,0.87,0.87,a) and Qt.rgba(0.91,0.45,0.16,a), which are just text and accent at alpha -- now textAlpha(a)/accentAlpha(a), so they track a palette change instead of silently drifting. Fonts came along too. Digital-7 Mono is dropped for DepartureMono: it was never packaged, relying on a manual ~/.dots/fonts/digital_7 install that does not exist on terra, so `fc-match "Digital-7 Mono"` resolved to DejaVu Sans and all 38 of those sites -- the launcher lists, sidebar clock, systray labels, every vitals readout -- were silently rendering in a PROPORTIONAL fallback. Numeric columns should visibly improve. readoutFont is an alias of displayFont rather than a second literal so the two roles cannot drift apart. quickshell/CLAUDE.md updated: it said "No shared theme/tokens file yet" and told contributors to grep for the existing hex color, which would now reintroduce exactly what this removes. Verified: no file references Theme. without the import, none imports it unused, and the whole shell -- launchers, sidebar, vitals, systray, notifications, not just the harness -- hot-reloaded clean on terra. tests/HeadlessSmoke.qml deliberately keeps its own copies; its value is having no dependencies. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SgcWkm3t6BDQktYHQvb8Hx
62 lines
3.2 KiB
QML
62 lines
3.2 KiB
QML
pragma Singleton
|
|
|
|
import Quickshell
|
|
import QtQuick
|
|
|
|
// Single source of truth for the shell's palette and font families.
|
|
//
|
|
// The shell previously ran two unrelated palettes: an amber one (#FFD063) used
|
|
// by the launchers, sidebar, systray, vitals and notifications, and an orange
|
|
// one (#e8722a) that only the dense bar had, tokenized as per-file properties.
|
|
// This unifies on the ORANGE values under the AMBER naming scheme.
|
|
//
|
|
// `surface` deliberately takes the dense bar's void (#0a0a0a) rather than the
|
|
// old panel background (#0F1012), which also absorbs the near-identical
|
|
// #0A0A0C scrim.
|
|
Singleton {
|
|
// ---- core ----
|
|
readonly property color accent: "#e8722a" // was #FFD063 (amber) / #e8722a (bar)
|
|
readonly property color text: "#dedede" // was #EEEEEE / #dedede
|
|
readonly property color muted: "#858585" // was #7A7B7D / #858585
|
|
readonly property color surface: "#0a0a0a" // was #0F1012 + #0A0A0C + #0a0a0a
|
|
readonly property color hot: "#ff6b4a" // alert/hot; no bar equivalent, kept
|
|
|
|
// ---- supporting darks ----
|
|
// A three-step ramp above `surface`. `raised` also absorbs #22262C, which
|
|
// differed from #292C30 by an imperceptible amount across two call sites.
|
|
readonly property color selection: "#1a1c1f" // selected row fill
|
|
readonly property color raised: "#292c30" // raised surface / border
|
|
readonly property color disabled: "#3a3d42" // unknown / disabled stroke
|
|
|
|
// ---- accents ----
|
|
// The pale "flash" the top/bottom bars show while a launcher is open. Was a
|
|
// hand-picked #FFF3C0 against amber; derived here so it tracks `accent`.
|
|
// 55% toward white reproduces the original amber relationship closely
|
|
// (#FFD063 -> #FFE9B8 vs the hand-picked #FFF3C0).
|
|
readonly property color accentSoft: Qt.tint(accent, Qt.rgba(1, 1, 1, 0.55))
|
|
readonly property color highlight: "#ffffff"
|
|
|
|
// ---- fonts ----
|
|
// Two faces. `readoutFont` is an alias rather than a second literal so the
|
|
// two roles cannot silently drift apart; point it at a different family if
|
|
// the readouts should ever diverge from the headings again.
|
|
//
|
|
// Installed by services/desktop/desktop-apps.nix (nerd-fonts.departure-mono).
|
|
// The former readout face, Digital-7 Mono, was never packaged — it relied on
|
|
// a manual ~/.dots/fonts/digital_7 install, so dropping it also removes an
|
|
// undeclared external dependency.
|
|
readonly property string displayFont: "DepartureMono Nerd Font" // headings, large values
|
|
readonly property string readoutFont: displayFont // seven-segment readouts: launchers, sidebar, systray, vitals
|
|
readonly property string microFont: "DejaVu Sans Mono" // dense bar micro labels
|
|
|
|
// ---- derived alpha variants ----
|
|
// The dense bar hand-encoded these as Qt.rgba(0.87,0.87,0.87,a) = text and
|
|
// Qt.rgba(0.91,0.45,0.16,a) = accent. Expressed as functions so the
|
|
// relationship survives a palette change.
|
|
function textAlpha(a) { return Qt.rgba(text.r, text.g, text.b, a); }
|
|
function accentAlpha(a) { return Qt.rgba(accent.r, accent.g, accent.b, a); }
|
|
|
|
// Hairline rule / panel outline: text at 28%.
|
|
readonly property color hair: textAlpha(0.28)
|
|
}
|