diff --git a/pagetop/src/base/component/heading.rs b/pagetop/src/base/component/heading.rs index 647ca6d2..41e9d28a 100644 --- a/pagetop/src/base/component/heading.rs +++ b/pagetop/src/base/component/heading.rs @@ -11,6 +11,7 @@ pub enum HeadingDisplay { Small, XxSmall, Normal, + Subtitle, } pub struct Heading { @@ -174,12 +175,13 @@ impl Heading { pub fn alter_display(&mut self, display: HeadingDisplay) -> &mut Self { self.display = display; self.classes.alter(match &self.display() { - HeadingDisplay::XxLarge => "display-2", - HeadingDisplay::Large => "display-3", - HeadingDisplay::Medium => "display-4", - HeadingDisplay::Small => "display-5", - HeadingDisplay::XxSmall => "display-6", - HeadingDisplay::Normal => "", + HeadingDisplay::XxLarge => "display-2", + HeadingDisplay::Large => "display-3", + HeadingDisplay::Medium => "display-4", + HeadingDisplay::Small => "display-5", + HeadingDisplay::XxSmall => "display-6", + HeadingDisplay::Normal => "", + HeadingDisplay::Subtitle => "", }, ClassesOp::SetDefault); self } diff --git a/pagetop/src/base/module/demopage.rs b/pagetop/src/base/module/demopage.rs index f10657df..b443b83d 100644 --- a/pagetop/src/base/module/demopage.rs +++ b/pagetop/src/base/module/demopage.rs @@ -88,9 +88,20 @@ fn just_visiting() -> Container { .with_spaces(&[SpaceSet::PaddingAll(SpaceValue::RelPct(2.0))]) ) .with_column(grid::Column::new() - .with_component(Heading::h2(html! { (l("visiting_title")) })) - .with_component(Heading::h3(html! { (l("visiting_subtitle")) })) - .with_component(Paragraph::with(html! { (l("visiting_text1")) })) + .with_component(Heading::h2(html! { + (l("visiting_title")) + }) + ) + .with_component(Heading::h3(html! { + (l("visiting_subtitle")) + }) + .with_display(HeadingDisplay::Subtitle) + ) + .with_component(Paragraph::with(html! { + (l("visiting_text1")) + }) + .with_display(ParagraphDisplay::Small) + ) .with_component(Paragraph::with(html! { (l("visiting_text2")) })) .with_spaces(&[ SpaceSet::PaddingTop(SpaceValue::RelPct(2.5)), diff --git a/pagetop/src/base/theme/bulmix.rs b/pagetop/src/base/theme/bulmix.rs index fdeeb4fa..7acbe441 100644 --- a/pagetop/src/base/theme/bulmix.rs +++ b/pagetop/src/base/theme/bulmix.rs @@ -44,14 +44,15 @@ impl ThemeTrait for Bulmix { }, HEADING_COMPONENT => { let h = component_mut::(component); - h.alter_classes(concat_string!("title ", match h.display() { - HeadingDisplay::XxLarge => "is-1", - HeadingDisplay::Large => "is-2", - HeadingDisplay::Medium => "is-3", - HeadingDisplay::Small => "is-4", - HeadingDisplay::XxSmall => "is-5", - HeadingDisplay::Normal => "", - }).as_str(), ClassesOp::SetDefault); + h.alter_classes(match h.display() { + HeadingDisplay::XxLarge => "title is-1", + HeadingDisplay::Large => "title is-2", + HeadingDisplay::Medium => "title is-3", + HeadingDisplay::Small => "title is-4", + HeadingDisplay::XxSmall => "title is-5", + HeadingDisplay::Normal => "title", + HeadingDisplay::Subtitle => "subtitle", + }, ClassesOp::SetDefault); }, PARAGRAPH_COMPONENT => { let p = component_mut::(component);