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
121 lines
3.1 KiB
QML
121 lines
3.1 KiB
QML
import Quickshell.Services.Notifications
|
||
import Quickshell.Widgets
|
||
import QtQuick
|
||
import QtQuick.Layouts
|
||
import qs.widgets.theme
|
||
|
||
ColumnLayout {
|
||
id: root
|
||
|
||
required property Notification modelData
|
||
|
||
spacing: 0
|
||
Layout.fillWidth: true
|
||
|
||
Rectangle {
|
||
color: Theme.accent
|
||
implicitHeight: 5
|
||
|
||
Layout.fillWidth: true
|
||
}
|
||
|
||
WrapperRectangle {
|
||
Layout.fillWidth: true
|
||
|
||
margin: 12
|
||
border.width: 1
|
||
border.color: Theme.accent
|
||
color: Theme.surface
|
||
opacity: .9
|
||
|
||
ColumnLayout {
|
||
spacing: 4
|
||
|
||
Layout.fillWidth: true
|
||
|
||
RowLayout {
|
||
spacing: 8
|
||
|
||
Layout.fillWidth: true
|
||
|
||
IconImage {
|
||
visible: root.modelData.appIcon !== ""
|
||
source: root.modelData.appIcon
|
||
implicitSize: 20
|
||
}
|
||
|
||
Text {
|
||
text: root.modelData.summary
|
||
color: Theme.text
|
||
font.pointSize: 14
|
||
font.bold: true
|
||
elide: Text.ElideRight
|
||
|
||
Layout.fillWidth: true
|
||
}
|
||
|
||
Text {
|
||
id: dismissButton
|
||
|
||
text: "×"
|
||
color: Theme.accent
|
||
font.pointSize: 18
|
||
|
||
MouseArea {
|
||
anchors.fill: parent
|
||
cursorShape: Qt.PointingHandCursor
|
||
onClicked: root.modelData.dismiss()
|
||
}
|
||
}
|
||
}
|
||
|
||
Text {
|
||
visible: root.modelData.body !== ""
|
||
text: root.modelData.body
|
||
color: Theme.text
|
||
font.pointSize: 12
|
||
wrapMode: Text.Wrap
|
||
|
||
Layout.fillWidth: true
|
||
}
|
||
|
||
RowLayout {
|
||
visible: root.modelData.actions.length > 0
|
||
spacing: 6
|
||
|
||
Layout.fillWidth: true
|
||
|
||
Repeater {
|
||
model: root.modelData.actions
|
||
|
||
Rectangle {
|
||
id: actionButton
|
||
|
||
required property NotificationAction modelData
|
||
|
||
color: Theme.raised
|
||
border.width: 1
|
||
border.color: Theme.accent
|
||
implicitHeight: 28
|
||
implicitWidth: actionText.implicitWidth + 16
|
||
|
||
Text {
|
||
id: actionText
|
||
anchors.centerIn: parent
|
||
text: actionButton.modelData.text
|
||
color: Theme.text
|
||
font.pointSize: 12
|
||
}
|
||
|
||
MouseArea {
|
||
anchors.fill: parent
|
||
cursorShape: Qt.PointingHandCursor
|
||
onClicked: actionButton.modelData.invoke()
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|