diff --git a/assets/css/layouts/_nav.css b/assets/css/layouts/_nav.css index c0ce8d6..4955f96 100644 --- a/assets/css/layouts/_nav.css +++ b/assets/css/layouts/_nav.css @@ -14,6 +14,9 @@ .nav-links a { transition: opacity .2s; } .nav-links a:hover { opacity: .55; } .nav-links a.nav-cta:hover { opacity: 1; } +/* Utilities (colour mode, Discord) sit in the bar on desktop and in the + collapsible menu on small screens. */ +.nav-menu-tools { display: none; } .nav-user-menu { position: relative; } .nav-user-menu summary { display: flex; align-items: center; gap: 6px; list-style: none; cursor: pointer; color: var(--color-muted); font-weight: 500; } .nav-user-menu summary::-webkit-details-marker { display: none; } @@ -42,6 +45,11 @@ html[data-theme="dark"] .nav-user-menu-panel { box-shadow: 0 18px 40px rgba(0, 0 .nav-links.open { display: flex; } .nav-cta { width: 100%; } .nav-links { display: none; position: absolute; top: 65px; left: 0; right: 0; padding: 24px; flex-direction: column; align-items: stretch; gap: 22px; border-radius: 10px; background: var(--color-canvas-raised); box-shadow: 0 18px 40px rgba(23,53,45,.15); } + .nav-menu-tools { display: flex; align-items: center; justify-content: space-between; gap: 18px; width: 100%; } + /* The menu owns these on small screens; keep them in the bar only when no + menu is rendered (prelaunch with no links). */ + .nav-wrap:has(#nav-links) .nav-right > [role="radiogroup"], + .nav-wrap:has(#nav-links) .nav-right > .discord-link { display: none; } .nav-user-menu-panel { position: static; min-width: 0; padding: 12px 0 0; background: transparent; box-shadow: none; } html[data-theme="dark"] .nav-links { box-shadow: 0 18px 40px rgba(0, 0, 0, .45); } } \ No newline at end of file diff --git a/lib/chesstrainer_web/components/layouts.ex b/lib/chesstrainer_web/components/layouts.ex index d74a0e3..9f4484c 100644 --- a/lib/chesstrainer_web/components/layouts.ex +++ b/lib/chesstrainer_web/components/layouts.ex @@ -126,6 +126,11 @@ defmodule ChesstrainerWeb.Layouts do Start training <.icon_arrow /> <% end %> + +
<% end %> diff --git a/lib/chesstrainer_web/components/layouts/theme_script.html.heex b/lib/chesstrainer_web/components/layouts/theme_script.html.heex index 8dd4041..fae2897 100644 --- a/lib/chesstrainer_web/components/layouts/theme_script.html.heex +++ b/lib/chesstrainer_web/components/layouts/theme_script.html.heex @@ -65,7 +65,10 @@ if (event.key !== "ArrowLeft" && event.key !== "ArrowRight") return; event.preventDefault(); - const buttons = Array.from(document.querySelectorAll("[data-phx-theme]")); + // Each breakpoint renders its own copy of the switch, so only the visible + // group takes part in arrow-key navigation. + const buttons = Array.from(document.querySelectorAll("[data-phx-theme]")) + .filter((button) => button.offsetParent !== null); const offset = event.key === "ArrowRight" ? 1 : -1; const index = (buttons.indexOf(button) + offset + buttons.length) % buttons.length; const next = buttons[index]; diff --git a/test/chesstrainer_web/components/layouts_test.exs b/test/chesstrainer_web/components/layouts_test.exs index f1d6dde..5aa8107 100644 --- a/test/chesstrainer_web/components/layouts_test.exs +++ b/test/chesstrainer_web/components/layouts_test.exs @@ -29,6 +29,15 @@ defmodule ChesstrainerWeb.LayoutsTest do assert html =~ ~p"/users/register" refute html =~ ~s(class="nav-user-menu") end + + test "renders the utility controls in both the bar and the mobile menu" do + html = render_component(&Layouts.navbar/1, %{current_scope: nil}) + + assert html =~ ~s(class="nav-menu-tools") + # One copy for the bar, one for the collapsible menu; CSS shows one. + assert length(String.split(html, ~s(role="radiogroup"))) == 3 + assert length(String.split(html, ~s(class="discord-link"))) == 3 + end end describe "discord_link/1" do