From aaf7b47547e7dd43efb4da2f2790745521cd6eea Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 18 Jan 2023 20:19:10 +0100 Subject: style --- server/src/routes/ui/style/mod.rs | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'server/src/routes/ui/style/mod.rs') diff --git a/server/src/routes/ui/style/mod.rs b/server/src/routes/ui/style/mod.rs index f3d751b..07e92dd 100644 --- a/server/src/routes/ui/style/mod.rs +++ b/server/src/routes/ui/style/mod.rs @@ -8,18 +8,25 @@ use std::{ fn css_bundle() -> String { if cfg!(debug_assertions) { - read_to_string( - PathBuf::from_str(file!()) - .unwrap() - .parent() + ["layout.css", "player.css"] + .into_iter() + .map(|n| { + read_to_string( + PathBuf::from_str(file!()) + .unwrap() + .parent() + .unwrap() + .join(n), + ) .unwrap() - .join("layout.css"), - ) - .unwrap() + }) + .collect::>() + .join("\n") } else { - include_str!("layout.css").to_string() + concat!(include_str!("layout.css"), include_str!("player.css")).to_string() } } + fn font_bundle() -> Vec { if cfg!(debug_assertions) { let mut woff = Vec::new(); -- cgit v1.2.3-70-g09d2