Merge feature/page-title-rename into dev
All checks were successful
dev release / build (push) Successful in 2m54s
All checks were successful
dev release / build (push) Successful in 2m54s
This commit is contained in:
commit
08cd1aa42a
9 changed files with 16 additions and 14 deletions
8
Cargo.lock
generated
8
Cargo.lock
generated
|
|
@ -35,7 +35,7 @@ checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bread-screenshots"
|
name = "bread-screenshots"
|
||||||
version = "0.3.1"
|
version = "0.3.1"
|
||||||
source = "git+https://git.breadway.dev/Breadway/bread-ecosystem?branch=dev#1a3475bd2358202f60e29c9bd27d06b1428b1a27"
|
source = "git+https://git.breadway.dev/Breadway/bread-ecosystem?branch=dev#f8f69f4ae528cd39208f12c0ef0cb814fd155645"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bread-utils 0.3.1",
|
"bread-utils 0.3.1",
|
||||||
|
|
@ -44,8 +44,8 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bread-theme"
|
name = "bread-theme"
|
||||||
version = "0.2.3"
|
version = "0.3.1"
|
||||||
source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.10#17d1bb85801b9a8c195b64c02d288cd662c9c780"
|
source = "git+https://git.breadway.dev/Breadway/bread-ecosystem?branch=dev#f8f69f4ae528cd39208f12c0ef0cb814fd155645"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dirs",
|
"dirs",
|
||||||
"gtk4",
|
"gtk4",
|
||||||
|
|
@ -67,7 +67,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bread-utils"
|
name = "bread-utils"
|
||||||
version = "0.3.1"
|
version = "0.3.1"
|
||||||
source = "git+https://git.breadway.dev/Breadway/bread-ecosystem?branch=dev#1a3475bd2358202f60e29c9bd27d06b1428b1a27"
|
source = "git+https://git.breadway.dev/Breadway/bread-ecosystem?branch=dev#f8f69f4ae528cd39208f12c0ef0cb814fd155645"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dirs",
|
"dirs",
|
||||||
"serde",
|
"serde",
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,10 @@ gdk4 = "0.11"
|
||||||
gtk4-layer-shell = "0.8"
|
gtk4-layer-shell = "0.8"
|
||||||
glib = "0.22"
|
glib = "0.22"
|
||||||
# Shared ecosystem theming — same generated stylesheet bos-settings/breadbar/
|
# Shared ecosystem theming — same generated stylesheet bos-settings/breadbar/
|
||||||
# breadbox/breadpad load, so this looks like part of the same desktop.
|
# breadbox/breadpad load, so this looks like part of the same desktop. Pinned
|
||||||
bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.2.10", features = ["gtk"] }
|
# 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 = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
toml = "0.8"
|
toml = "0.8"
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ use std::cell::RefCell;
|
||||||
|
|
||||||
const APP_CSS: &str = "\
|
const APP_CSS: &str = "\
|
||||||
.view-content { padding: 24px; }\n\
|
.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\
|
/* [Show Keybind] chip: reads as a keycap inline with guide/keybind-viewer text. */\n\
|
||||||
label.keybind-chip { \
|
label.keybind-chip { \
|
||||||
font-family: monospace; \
|
font-family: monospace; \
|
||||||
|
|
@ -44,7 +44,7 @@ window.tour-window { background-color: transparent; }\n\
|
||||||
border-radius: 12px; \
|
border-radius: 12px; \
|
||||||
padding: 16px 20px; \
|
padding: 16px 20px; \
|
||||||
}\n\
|
}\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 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 \
|
the compositor proved it — shouldn't read as the same throwaway meta \
|
||||||
text as the step counter. */\n\
|
text as the step counter. */\n\
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,7 @@ pub fn build(store: Rc<ContentStore>, binds: Rc<Vec<Keybind>>, mode: Mode) -> Wi
|
||||||
}
|
}
|
||||||
Kind::Command { name, description } => {
|
Kind::Command { name, description } => {
|
||||||
let title = Label::new(Some(name));
|
let title = Label::new(Some(name));
|
||||||
title.add_css_class("title");
|
title.add_css_class("page-title");
|
||||||
title.set_xalign(0.0);
|
title.set_xalign(0.0);
|
||||||
detail.append(&title);
|
detail.append(&title);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ pub fn build(store: &ContentStore, guide: &Guide, simplified: bool, binds: &[Key
|
||||||
vbox.add_css_class("view-content");
|
vbox.add_css_class("view-content");
|
||||||
|
|
||||||
let title = Label::new(Some(&guide.meta.title));
|
let title = Label::new(Some(&guide.meta.title));
|
||||||
title.add_css_class("title");
|
title.add_css_class("page-title");
|
||||||
title.set_xalign(0.0);
|
title.set_xalign(0.0);
|
||||||
vbox.append(&title);
|
vbox.append(&title);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ pub fn build(
|
||||||
|
|
||||||
let header = GBox::new(Orientation::Horizontal, 12);
|
let header = GBox::new(Orientation::Horizontal, 12);
|
||||||
let title = Label::new(Some("Home"));
|
let title = Label::new(Some("Home"));
|
||||||
title.add_css_class("title");
|
title.add_css_class("page-title");
|
||||||
title.set_xalign(0.0);
|
title.set_xalign(0.0);
|
||||||
title.set_hexpand(true);
|
title.set_hexpand(true);
|
||||||
header.append(&title);
|
header.append(&title);
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ pub fn build(binds: &[Keybind]) -> gtk4::Widget {
|
||||||
let vbox = GBox::new(Orientation::Vertical, 6);
|
let vbox = GBox::new(Orientation::Vertical, 6);
|
||||||
|
|
||||||
let header = Label::new(Some("Keybinds"));
|
let header = Label::new(Some("Keybinds"));
|
||||||
header.add_css_class("title");
|
header.add_css_class("page-title");
|
||||||
header.set_xalign(0.0);
|
header.set_xalign(0.0);
|
||||||
vbox.append(&header);
|
vbox.append(&header);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ pub fn build(
|
||||||
root.set_size_request(CALLOUT_WIDTH, -1);
|
root.set_size_request(CALLOUT_WIDTH, -1);
|
||||||
|
|
||||||
let title = Label::new(Some(&step.title));
|
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_xalign(0.0);
|
||||||
title.set_wrap(true);
|
title.set_wrap(true);
|
||||||
root.append(&title);
|
root.append(&title);
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ impl Wizard {
|
||||||
self.clear();
|
self.clear();
|
||||||
|
|
||||||
let title = Label::new(Some("What's wrong?"));
|
let title = Label::new(Some("What's wrong?"));
|
||||||
title.add_css_class("title");
|
title.add_css_class("page-title");
|
||||||
title.set_xalign(0.0);
|
title.set_xalign(0.0);
|
||||||
self.content.append(&title);
|
self.content.append(&title);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue