diff --git a/Cargo.lock b/Cargo.lock index 42bf86d..959c458 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,8 +44,8 @@ dependencies = [ [[package]] name = "bread-theme" -version = "0.2.3" -source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.10#17d1bb85801b9a8c195b64c02d288cd662c9c780" +version = "0.3.1" +source = "git+https://git.breadway.dev/Breadway/bread-ecosystem?branch=dev#4e76bc707720fbfc52e19a8cc78f3fb1e6e0a713" dependencies = [ "dirs", "gtk4", diff --git a/Cargo.toml b/Cargo.toml index 865ff56..8a21e5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,8 +9,10 @@ gdk4 = "0.11" gtk4-layer-shell = "0.8" glib = "0.22" # Shared ecosystem theming — same generated stylesheet bos-settings/breadbar/ -# breadbox/breadpad load, so this looks like part of the same desktop. -bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.2.10", features = ["gtk"] } +# breadbox/breadpad load, so this looks like part of the same desktop. Pinned +# to dev (not a tag) for the .title -> .page-title rename, which doesn't have +# a tagged release yet. +bread-theme = { git = "https://git.breadway.dev/Breadway/bread-ecosystem", branch = "dev", features = ["gtk"] } serde = { version = "1", features = ["derive"] } serde_json = "1" toml = "0.8" diff --git a/src/theme.rs b/src/theme.rs index 505939a..ae967c5 100644 --- a/src/theme.rs +++ b/src/theme.rs @@ -10,7 +10,7 @@ use std::cell::RefCell; const APP_CSS: &str = "\ .view-content { padding: 24px; }\n\ -.view-content > label.title { margin-bottom: 16px; }\n\ +.view-content > label.page-title { margin-bottom: 16px; }\n\ /* [Show Keybind] chip: reads as a keycap inline with guide/keybind-viewer text. */\n\ label.keybind-chip { \ font-family: monospace; \ @@ -44,7 +44,7 @@ window.tour-window { background-color: transparent; }\n\ border-radius: 12px; \ padding: 16px 20px; \ }\n\ -.tour-callout label.title { font-weight: bold; font-size: 15px; }\n\ +.tour-callout label.page-title { font-weight: bold; font-size: 15px; }\n\ /* The one payoff line in the whole tour — the user did the real thing and \ the compositor proved it — shouldn't read as the same throwaway meta \ text as the step counter. */\n\ diff --git a/src/ui/ask.rs b/src/ui/ask.rs index 157ea82..a79e6d2 100644 --- a/src/ui/ask.rs +++ b/src/ui/ask.rs @@ -148,7 +148,7 @@ pub fn build(store: Rc, binds: Rc>, mode: Mode) -> Wi } Kind::Command { name, description } => { let title = Label::new(Some(name)); - title.add_css_class("title"); + title.add_css_class("page-title"); title.set_xalign(0.0); detail.append(&title); diff --git a/src/ui/guide_view.rs b/src/ui/guide_view.rs index 42da4c7..7007418 100644 --- a/src/ui/guide_view.rs +++ b/src/ui/guide_view.rs @@ -8,7 +8,7 @@ pub fn build(store: &ContentStore, guide: &Guide, simplified: bool, binds: &[Key vbox.add_css_class("view-content"); let title = Label::new(Some(&guide.meta.title)); - title.add_css_class("title"); + title.add_css_class("page-title"); title.set_xalign(0.0); vbox.append(&title); diff --git a/src/ui/home.rs b/src/ui/home.rs index 74ac629..2d9ebc3 100644 --- a/src/ui/home.rs +++ b/src/ui/home.rs @@ -47,7 +47,7 @@ pub fn build( let header = GBox::new(Orientation::Horizontal, 12); let title = Label::new(Some("Home")); - title.add_css_class("title"); + title.add_css_class("page-title"); title.set_xalign(0.0); title.set_hexpand(true); header.append(&title); diff --git a/src/ui/keybind_viewer.rs b/src/ui/keybind_viewer.rs index 3cb2f14..a82cd49 100644 --- a/src/ui/keybind_viewer.rs +++ b/src/ui/keybind_viewer.rs @@ -7,7 +7,7 @@ pub fn build(binds: &[Keybind]) -> gtk4::Widget { let vbox = GBox::new(Orientation::Vertical, 6); let header = Label::new(Some("Keybinds")); - header.add_css_class("title"); + header.add_css_class("page-title"); header.set_xalign(0.0); vbox.append(&header); diff --git a/src/ui/tour/callout.rs b/src/ui/tour/callout.rs index 2368ca1..4943824 100644 --- a/src/ui/tour/callout.rs +++ b/src/ui/tour/callout.rs @@ -72,7 +72,7 @@ pub fn build( root.set_size_request(CALLOUT_WIDTH, -1); let title = Label::new(Some(&step.title)); - title.add_css_class("title"); + title.add_css_class("page-title"); title.set_xalign(0.0); title.set_wrap(true); root.append(&title); diff --git a/src/ui/troubleshoot_wizard.rs b/src/ui/troubleshoot_wizard.rs index f3c4bf2..c012835 100644 --- a/src/ui/troubleshoot_wizard.rs +++ b/src/ui/troubleshoot_wizard.rs @@ -64,7 +64,7 @@ impl Wizard { self.clear(); let title = Label::new(Some("What's wrong?")); - title.add_css_class("title"); + title.add_css_class("page-title"); title.set_xalign(0.0); self.content.append(&title);