Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions rhombus/frontend/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -207,29 +207,29 @@ const CommandMenu = () => {
</CommandItem>
</Show>
</CommandGroup>
<CommandSeparator />
<CommandGroup heading={translate("theme")}>
<CommandItem
onSelect={() => {
// @ts-ignore
setTheme(false);
setOpen(false);
}}
>
<SunIcon class="mr-2 h-4 w-4" />
<span>{translate("light-theme")}</span>
</CommandItem>
<CommandItem
onSelect={() => {
// @ts-ignore
setTheme(true);
setOpen(false);
}}
>
<MoonIcon class="mr-2 h-4 w-4" />
<span>{translate("dark-theme")}</span>
</CommandItem>
</CommandGroup>
{/* <CommandSeparator />
<CommandGroup heading={translate("theme")}>
<CommandItem
onSelect={() => {
// @ts-ignore
setTheme(false);
setOpen(false);
}}
>
<SunIcon class="mr-2 h-4 w-4" />
<span>{translate("light-theme")}</span>
</CommandItem>
<CommandItem
onSelect={() => {
// @ts-ignore
setTheme(true);
setOpen(false);
}}
>
<MoonIcon class="mr-2 h-4 w-4" />
<span>{translate("dark-theme")}</span>
</CommandItem>
</CommandGroup> */}
</CommandList>
</CommandDialog>
);
Expand Down
3 changes: 2 additions & 1 deletion rhombus/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,8 @@ impl Builder {

let (outbound_mailer, mailgun_router): (Option<Arc<_>>, axum::Router<RouterState>) =
if let Some(email) = settings.clone().read().await.email.as_ref() {
let logo_path = find_image_file("static/logo")
let logo_path = find_image_file("static/email_logo")
.or_else(|| find_image_file("static/logo"))
.map(|p| p.to_str().unwrap().to_owned())
.unwrap_or("static/logo.svg".to_owned());
if email.mailgun.is_some() {
Expand Down
2 changes: 1 addition & 1 deletion rhombus/static/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const getThemePreference = () => {
: "light";
};
const setTheme = (isDark) => {
document.documentElement.classList[isDark ? "add" : "remove"]("dark");
// document.documentElement.classList[isDark ? "add" : "remove"]("dark");
};

window
Expand Down
2 changes: 1 addition & 1 deletion rhombus/templates/base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en">
<html lang="en" class="dark">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand Down
2 changes: 1 addition & 1 deletion rhombus/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
hx-swap="outerHTML"
class="flex"
>
<a href="/" class="mr-6 flex items-center space-x-2">
<a href="/" class="flex flex-shrink-0 items-center space-x-2">
{% include "logo.html" %}

<span class="hidden font-bold sm:inline-block lg:text-base"
Expand Down