purple theme

2 files changed, 4 insertions, 8 deletions

diff --git a/server/src/routes/ui/account/settings.rs b/server/src/routes/ui/account/settings.rs
index 6a9a50e..2192d43 100644
--- a/server/src/routes/ui/account/settings.rs
+++ b/server/src/routes/ui/account/settings.rs
@@ -66,8 +66,8 @@ fn settings_page(session: Session, flash: Option<MyResult<String>>) -> DynLayout
             form[method="POST", action=uri!(r_account_settings_post())] {
                 fieldset {
                     legend { "Theme" }
-                    @for (t, tlabel) in [(Theme::Dark, "Dark theme"), (Theme::Light, "Light theme")] {
-                        label { input[type="radio", name="theme", value=A(t), checked=session.user.theme==t]; @tlabel } br;
+                    @for (t, tlabel) in Theme::LIST {
+                        label { input[type="radio", name="theme", value=A(*t), checked=session.user.theme==*t]; @tlabel } br;
                     }
                 }
                 input[type="submit", value="Apply"];
diff --git a/server/src/routes/ui/layout.rs b/server/src/routes/ui/layout.rs
index c4d1275..3ba5e88 100644
--- a/server/src/routes/ui/layout.rs
+++ b/server/src/routes/ui/layout.rs
@@ -104,16 +104,12 @@ impl<'r, Main: Render> Responder<'r, 'static> for LayoutPage<Main> {
             main: self.content,
             title: self.title,
             class: &format!(
-                "{} {}",
+                "{} theme-{:?}",
                 self.class.as_deref().unwrap_or(""),
-                match session
+                session
                     .as_ref()
                     .map(|s| s.user.theme)
                     .unwrap_or(Theme::Dark)
-                {
-                    Theme::Dark => "theme-dark",
-                    Theme::Light => "theme-light",
-                }
             ),
             session,
         }