From 7fadc681e9a4f7e22ca7ffdb70ea08e0ea8bdd9b Mon Sep 17 00:00:00 2001
From: JMARyA <jmarya@hydrar.de>
Date: Wed, 19 Feb 2025 17:52:23 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/asset.rs               | 17 ++++++++++-------
 src/ui/components/modal.rs | 22 ++++++++--------------
 src/ui/components/shell.rs | 11 +++++++----
 src/ui/primitives/grid.rs  | 34 +++++++++++++++++++---------------
 4 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/asset.rs b/src/asset.rs
index 0239eda..2a929f9 100644
--- a/src/asset.rs
+++ b/src/asset.rs
@@ -52,12 +52,15 @@ pub trait AssetRoutes {
 
 impl AssetRoutes for rocket::Rocket<Build> {
     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/modal.rs b/src/ui/components/modal.rs
index 64b378b..17f80a8 100644
--- a/src/ui/components/modal.rs
+++ b/src/ui/components/modal.rs
@@ -26,9 +26,11 @@ pub fn Modal<T: UIWidget + 'static, E: UIWidget + 'static, F: FnOnce(String) ->
 ) -> (String, PreEscaped<String>) {
     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" {
@@ -49,15 +51,7 @@ pub fn Modal<T: UIWidget + 'static, E: UIWidget + 'static, F: FnOnce(String) ->
                     (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 ed5fd23..85e3b79 100644
--- a/src/ui/components/shell.rs
+++ b/src/ui/components/shell.rs
@@ -278,10 +278,13 @@ pub fn BottomNavigationTile<T: UIWidget + 'static>(
 ) -> ClassicWidget<LinkWidget> {
     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 cd1e345..31d46c1 100644
--- a/src/ui/primitives/grid.rs
+++ b/src/ui/primitives/grid.rs
@@ -274,21 +274,25 @@ 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
     }