From e56a54644788502aa64fb886618782c5e9593fd6 Mon Sep 17 00:00:00 2001 From: Aaron Erhardt Date: Wed, 13 Nov 2024 12:22:20 +0100 Subject: [PATCH] chore(tailor_gui): Use newer adwaita styles --- tailor_gui/data/resources/style.css | 4 ++-- tailor_gui/src/components/fan_edit.rs | 1 - tailor_gui/src/components/led_edit.rs | 4 ---- tailor_gui/src/templates.rs | 5 ++--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tailor_gui/data/resources/style.css b/tailor_gui/data/resources/style.css index 8bf5086..1fa3d3e 100644 --- a/tailor_gui/data/resources/style.css +++ b/tailor_gui/data/resources/style.css @@ -1,4 +1,4 @@ -.title-header{ +.title-header { font-size: 36px; font-weight: bold; } @@ -14,4 +14,4 @@ levelbar trough block { .fan-dialog .message-area { padding: 12px; -} \ No newline at end of file +} diff --git a/tailor_gui/src/components/fan_edit.rs b/tailor_gui/src/components/fan_edit.rs index b6436d6..6d8fe47 100644 --- a/tailor_gui/src/components/fan_edit.rs +++ b/tailor_gui/src/components/fan_edit.rs @@ -157,7 +157,6 @@ impl Component for FanEdit { } } }, - gtk::Separator {}, #[template] templates::MsgDialogButtons { diff --git a/tailor_gui/src/components/led_edit.rs b/tailor_gui/src/components/led_edit.rs index 0b8b72a..79706e5 100644 --- a/tailor_gui/src/components/led_edit.rs +++ b/tailor_gui/src/components/led_edit.rs @@ -92,8 +92,6 @@ impl Component for LedEdit { }, gtk::ScrolledWindow { - add_css_class: "background", - adw::Clamp { set_margin_all: 12, set_vexpand: true, @@ -149,8 +147,6 @@ impl Component for LedEdit { } }, - gtk::Separator {}, - #[template] templates::MsgDialogButtons { #[template_child] diff --git a/tailor_gui/src/templates.rs b/tailor_gui/src/templates.rs index 171b750..92888ab 100644 --- a/tailor_gui/src/templates.rs +++ b/tailor_gui/src/templates.rs @@ -43,15 +43,14 @@ impl WidgetTemplate for MsgDialogButtons { set_label: "Cancel", set_hexpand: true, #[iterate] - add_css_class: &["flat", "destructive"], + add_css_class: &["destructive-action"], }, - gtk::Separator, #[name(save_button)] gtk::Button { set_label: "Save", set_hexpand: true, #[iterate] - add_css_class: &["flat", "suggested"], + add_css_class: &["suggested-action"], }, } }