From 62be74841956809272449fa95349afc5f46c7702 Mon Sep 17 00:00:00 2001 From: Rick Barrette Date: Tue, 3 Nov 2026 20:25:40 -0500 Subject: [PATCH] Dark mode toggle in the phone slide-out menu, and let that menu scroll Co-Authored-By: Claude Opus 5.5 --- assets/javascripts/dark_mode.js | 36 +++++++++++++++++++++++++------- assets/stylesheets/dark_mode.css | 21 +++++++++++++++++++ 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/assets/javascripts/dark_mode.js b/assets/javascripts/dark_mode.js index 565afb6..c34f6c9 100644 --- a/assets/javascripts/dark_mode.js +++ b/assets/javascripts/dark_mode.js @@ -24,12 +24,15 @@ }); } - function render(button) { + // The top bar's icon button, and on phones a line in the slide-out menu (the top bar is hidden there) + function render(button, link) { var dm = window.RedmineDarkMode; var label = isDark() ? dm.labels.light : dm.labels.dark; - button.innerHTML = isDark() ? SUN : MOON; + var icon = isDark() ? SUN : MOON; + button.innerHTML = icon; button.title = label; button.setAttribute('aria-label', label); + if (link) link.innerHTML = icon + '' + label + ''; } document.addEventListener('DOMContentLoaded', function () { @@ -39,18 +42,37 @@ var button = document.createElement('button'); button.type = 'button'; button.className = 'dark-mode-toggle'; - render(button); - button.addEventListener('click', function () { + + var link = null; + var flyout = document.querySelector('.js-flyout-menu'); + if (flyout) { + var list = document.createElement('ul'); + list.className = 'dark-mode-flyout'; + var item = document.createElement('li'); + link = document.createElement('a'); + link.href = '#'; + link.className = 'dark-mode-flyout-toggle'; + item.appendChild(link); + list.appendChild(item); + flyout.appendChild(list); + } + + function toggle(e) { + e.preventDefault(); var mode = isDark() ? 'light' : 'dark'; window.RedmineDarkMode.set(mode); - render(button); + render(button, link); save(mode); - }); + } + + render(button, link); + button.addEventListener('click', toggle); + if (link) link.addEventListener('click', toggle); menu.insertBefore(button, menu.firstChild); // The device switching light/dark (Automatic) changes the icon too var media = window.matchMedia('(prefers-color-scheme: dark)'); - if (media.addEventListener) media.addEventListener('change', function () { render(button); }); + if (media.addEventListener) media.addEventListener('change', function () { render(button, link); }); }); })(); diff --git a/assets/stylesheets/dark_mode.css b/assets/stylesheets/dark_mode.css index 26891ea..f92f1fe 100644 --- a/assets/stylesheets/dark_mode.css +++ b/assets/stylesheets/dark_mode.css @@ -245,6 +245,27 @@ html.dark-mode .item-description { color: #969aa1; } color: #fff; } +/* The phone slide-out menu's dark mode line, after the profile links */ +.flyout-menu ul.dark-mode-flyout { margin-top: 12px; } +.flyout-menu .dark-mode-flyout-toggle { display: flex; align-items: center; gap: 8px; } +.flyout-menu .dark-mode-flyout-toggle svg { flex: none; } + +/* Redmine's open slide-out menu is as tall as the page and the page can't scroll while it's open, so on a + phone its last lines (Sign out, this toggle) sat out of reach. Pinned to the screen, it scrolls by itself. */ +@media screen and (max-width: 899px) { + .flyout-is-active .flyout-menu { + position: fixed; + inset-block: 0; + inset-inline-end: 0; + block-size: 100vh; + block-size: 100dvh; + overflow-y: auto; + overscroll-behavior: contain; + -webkit-overflow-scrolling: touch; + z-index: 100; + } +} + /* Issue boxes and other cards: Gitea's card colour instead of Redmine's pale yellow */ html.dark-mode div.issue { background: #191a1c; border-color: #3f4248; }