Merge pull request #341 from aapis/feature/1.19/timeline-ux

Timeline UX improvements
aapis · Nov 14, 2024 · 044887b · 044887b
2 parents 5baf53b + fcdb843
commit 044887b
Show file tree

Hide file tree

Showing 5 changed files with 266 additions and 228 deletions.
diff --git a/KWCore/Sources/UI/WidgetLibrary/WidgetLibrary.UI.Buttons.swift b/KWCore/Sources/UI/WidgetLibrary/WidgetLibrary.UI.Buttons.swift
@@ -381,6 +381,7 @@ extension WidgetLibrary.UI {
                     action: {self.commandLineMode.toggle() ; self.onAction?()},
                     icon: self.commandLineMode ? "apple.terminal.fill" : "apple.terminal",
                     iconWhenHighlighted: self.commandLineMode ? "apple.terminal" : "apple.terminal.fill",
+                    iconFgColour: self.commandLineMode ? self.state.theme.tint : .white,
                     showLabel: false,
                     size: .small,
                     type: .clear,
@@ -585,7 +586,7 @@ extension WidgetLibrary.UI {
                             .foregroundStyle(Theme.base)
                             .underline(self.isHighlighted)
                     }
-                    .background(Theme.cPurple)
+                    .background(self.state.session.appPage.primaryColour)
                     .clipShape(.capsule(style: .circular))
                 }
                 .buttonStyle(.plain)