From f990311222b050e3ba2592f12d3afcc2bc17c2a4 Mon Sep 17 00:00:00 2001 From: JMARyA Date: Wed, 19 Feb 2025 17:49:10 +0100 Subject: [PATCH] fix --- src/asset.rs | 17 +++++++---------- src/ui/components/mod.rs | 1 - src/ui/components/modal.rs | 22 ++++++++++++++-------- src/ui/components/shell.rs | 11 ++++------- src/ui/primitives/grid.rs | 34 +++++++++++++++------------------- 5 files changed, 40 insertions(+), 45 deletions(-) diff --git a/src/asset.rs b/src/asset.rs index 2a929f9..0239eda 100644 --- a/src/asset.rs +++ b/src/asset.rs @@ -52,15 +52,12 @@ pub trait AssetRoutes { impl AssetRoutes for rocket::Rocket { fn mount_assets(self) -> Self { - self.mount( - "/", - routes![ - crate::asset::htmx_script_route, - crate::asset::flowbite_css, - crate::asset::flowbite_js, - crate::asset::material_css, - crate::asset::material_font - ], - ) + self.mount("/", routes![ + crate::asset::htmx_script_route, + crate::asset::flowbite_css, + crate::asset::flowbite_js, + crate::asset::material_css, + crate::asset::material_font + ]) } } diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs index c207465..d3e5219 100644 --- a/src/ui/components/mod.rs +++ b/src/ui/components/mod.rs @@ -31,7 +31,6 @@ pub mod prelude { Alignment, BottomNavigation, BottomNavigationTile, Classic, ClassicWidget, FetchToast, NavBar, Position, Shell, Toast, }; - pub use super::timeline::{ActivityLog, ActivityLogElement, Timeline, TimelineElement}; pub use super::{ Accordion, Alert, Banner, Breadcrumb, Card, Carousel, CarouselMode, ColoredAlert, ColoredSpinner, CopyText, FetchAlert, FnKey, HelpIcon, HorizontalLine, IconStepper, diff --git a/src/ui/components/modal.rs b/src/ui/components/modal.rs index 17f80a8..64b378b 100644 --- a/src/ui/components/modal.rs +++ b/src/ui/components/modal.rs @@ -26,11 +26,9 @@ pub fn Modal ) -> (String, PreEscaped) { let id = uuid::Uuid::new_v4().to_string(); - ( - format!("modal-{id}"), - html! { - div id=(format!("modal-{id}")) tabindex="-1" aria-hidden="true" class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full" { - div class="relative p-4 w-full max-w-2xl max-h-full" { + (format!("modal-{id}"), html! { + div id=(format!("modal-{id}")) tabindex="-1" aria-hidden="true" class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full" { + div class="relative p-4 w-full max-w-2xl max-h-full" { div class="relative bg-white rounded-lg shadow dark:bg-gray-700" { div class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600" { @@ -51,7 +49,15 @@ pub fn Modal (footer(format!("modal-{id}"))) }; }; - }}; - }, - ) + + div class="p-4 md:p-5 space-y-4" { + (body) + }; + + div class="flex items-center p-4 md:p-5 border-t border-gray-200 rounded-b dark:border-gray-600" { + (footer(format!("modal-{id}"))) + }; + }; + }}; + }) } diff --git a/src/ui/components/shell.rs b/src/ui/components/shell.rs index 85e3b79..ed5fd23 100644 --- a/src/ui/components/shell.rs +++ b/src/ui/components/shell.rs @@ -278,13 +278,10 @@ pub fn BottomNavigationTile( ) -> ClassicWidget { Classic( "inline-flex flex-col items-center justify-center px-5 hover:bg-gray-50 dark:hover:bg-gray-800 group", - Link( - reference, - html! { - (icon.map(|x| x.render()).unwrap_or_default()); - span class="text-sm text-gray-500 dark:text-gray-400 group-hover:text-blue-600 dark:group-hover:text-blue-500" { (text) }; - }, - ), + Link(reference, html! { + (icon.map(|x| x.render()).unwrap_or_default()); + span class="text-sm text-gray-500 dark:text-gray-400 group-hover:text-blue-600 dark:group-hover:text-blue-500" { (text) }; + }), ) } diff --git a/src/ui/primitives/grid.rs b/src/ui/primitives/grid.rs index 31d46c1..cd1e345 100644 --- a/src/ui/primitives/grid.rs +++ b/src/ui/primitives/grid.rs @@ -274,25 +274,21 @@ impl GridElement { } pub fn span(mut self, value: GridElementValue) -> Self { - self.1.push(format!( - "{}-span-{}", - self.2, - match value { - GridElementValue::_1 => "1", - GridElementValue::_2 => "2", - GridElementValue::_3 => "3", - GridElementValue::_4 => "4", - GridElementValue::_5 => "5", - GridElementValue::_6 => "6", - GridElementValue::_7 => "7", - GridElementValue::_8 => "8", - GridElementValue::_9 => "9", - GridElementValue::_10 => "10", - GridElementValue::_11 => "11", - GridElementValue::_12 => "12", - GridElementValue::Auto => "full", - } - )); + self.1.push(format!("{}-span-{}", self.2, match value { + GridElementValue::_1 => "1", + GridElementValue::_2 => "2", + GridElementValue::_3 => "3", + GridElementValue::_4 => "4", + GridElementValue::_5 => "5", + GridElementValue::_6 => "6", + GridElementValue::_7 => "7", + GridElementValue::_8 => "8", + GridElementValue::_9 => "9", + GridElementValue::_10 => "10", + GridElementValue::_11 => "11", + GridElementValue::_12 => "12", + GridElementValue::Auto => "full", + })); self }