This commit is contained in:
parent
f990311222
commit
7fadc681e9
4 changed files with 44 additions and 40 deletions
|
@ -52,12 +52,15 @@ pub trait AssetRoutes {
|
|||
|
||||
impl AssetRoutes for rocket::Rocket<Build> {
|
||||
fn mount_assets(self) -> Self {
|
||||
self.mount("/", routes![
|
||||
self.mount(
|
||||
"/",
|
||||
routes![
|
||||
crate::asset::htmx_script_route,
|
||||
crate::asset::flowbite_css,
|
||||
crate::asset::flowbite_js,
|
||||
crate::asset::material_css,
|
||||
crate::asset::material_font
|
||||
])
|
||||
],
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,9 @@ 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! {
|
||||
(
|
||||
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" {
|
||||
|
||||
|
@ -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}")))
|
||||
};
|
||||
};
|
||||
}};
|
||||
})
|
||||
},
|
||||
)
|
||||
}
|
||||
|
|
|
@ -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! {
|
||||
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) };
|
||||
}),
|
||||
},
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -274,7 +274,10 @@ impl GridElement {
|
|||
}
|
||||
|
||||
pub fn span(mut self, value: GridElementValue) -> Self {
|
||||
self.1.push(format!("{}-span-{}", self.2, match value {
|
||||
self.1.push(format!(
|
||||
"{}-span-{}",
|
||||
self.2,
|
||||
match value {
|
||||
GridElementValue::_1 => "1",
|
||||
GridElementValue::_2 => "2",
|
||||
GridElementValue::_3 => "3",
|
||||
|
@ -288,7 +291,8 @@ impl GridElement {
|
|||
GridElementValue::_11 => "11",
|
||||
GridElementValue::_12 => "12",
|
||||
GridElementValue::Auto => "full",
|
||||
}));
|
||||
}
|
||||
));
|
||||
self
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue