From e90bb4818dfe44b437f7c36a8e174a1b4c09bf7d Mon Sep 17 00:00:00 2001 From: Reece Browne <74901996+reecebrowne@users.noreply.github.com> Date: Tue, 5 Aug 2025 23:55:39 +0100 Subject: [PATCH 1/3] Update githubVersion.js Fix dark mode windows preference - no cookie --- .../src/main/resources/static/js/githubVersion.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/core/src/main/resources/static/js/githubVersion.js b/app/core/src/main/resources/static/js/githubVersion.js index 059fcccfa..8fb6b8cb8 100644 --- a/app/core/src/main/resources/static/js/githubVersion.js +++ b/app/core/src/main/resources/static/js/githubVersion.js @@ -309,8 +309,9 @@ async function showUpdateModal() { // Update modal with full information const modalBody = document.getElementById('updateModalBody'); if (fullUpdateInfo && fullUpdateInfo.new_versions) { - // Check if dark mode is active - const isDarkMode = localStorage.getItem("dark-mode") === "on"; + const storedMode = localStorage.getItem("dark-mode"); + const isDarkMode = storedMode === "on" || + (storedMode === null && window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches); const darkClasses = isDarkMode ? { accordionItem: 'bg-dark border-secondary text-light', accordionButton: 'bg-dark text-light border-secondary', @@ -372,9 +373,9 @@ async function showUpdateModal() { }); var accordionButtons = document.querySelectorAll("#versionsAccordion .accordion-button"); accordionButtons.forEach((button) => { - button.style.color = ""; - button.style.backgroundColor = ""; - button.style.borderColor = ""; + button.style.color = "var(--md-sys-color-on-surface)"; + button.style.backgroundColor = "var(--md-sys-color-surface-5)"; + button.style.borderColor = "var(--md-sys-color-outline-variant)"; }); var accordionBodies = document.querySelectorAll("#versionsAccordion .accordion-body"); accordionBodies.forEach((body) => { From d1a7c8011d058ac766396601907ec7ae68e5f0d3 Mon Sep 17 00:00:00 2001 From: Reece Browne Date: Wed, 6 Aug 2025 23:25:04 +0100 Subject: [PATCH 2/3] Use base theme --- .../src/main/resources/static/js/darkmode.js | 19 ----------- .../main/resources/static/js/githubVersion.js | 32 ++++--------------- 2 files changed, 7 insertions(+), 44 deletions(-) diff --git a/app/core/src/main/resources/static/js/darkmode.js b/app/core/src/main/resources/static/js/darkmode.js index 0cfd37d37..abfe737c9 100644 --- a/app/core/src/main/resources/static/js/darkmode.js +++ b/app/core/src/main/resources/static/js/darkmode.js @@ -45,25 +45,6 @@ function setMode(mode) { tables.forEach((table) => { table.classList.add("table-dark"); }); - - // Handle dynamically created accordion elements - var accordionItems = document.querySelectorAll(".accordion-item"); - accordionItems.forEach((item) => { - item.style.color = "var(--md-sys-color-on-surface)"; - item.style.backgroundColor = "var(--md-sys-color-surface-5)"; - item.style.border = "1px solid var(--md-sys-color-outline-variant)"; - }); - var accordionButtons = document.querySelectorAll(".accordion-button"); - accordionButtons.forEach((button) => { - button.style.color = "var(--md-sys-color-on-surface)"; - button.style.backgroundColor = "var(--md-sys-color-surface-5)"; - button.style.borderColor = "var(--md-sys-color-outline-variant)"; - }); - var accordionBodies = document.querySelectorAll(".accordion-body"); - accordionBodies.forEach((body) => { - body.style.color = "var(--md-sys-color-on-surface)"; - body.style.backgroundColor = "var(--md-sys-color-surface-5)"; - }); } else if (mode === "off") { if (elements && elements.darkModeIcon) { elements.darkModeIcon.textContent = "light_mode"; diff --git a/app/core/src/main/resources/static/js/githubVersion.js b/app/core/src/main/resources/static/js/githubVersion.js index 8fb6b8cb8..c7d299791 100644 --- a/app/core/src/main/resources/static/js/githubVersion.js +++ b/app/core/src/main/resources/static/js/githubVersion.js @@ -327,9 +327,10 @@ async function showUpdateModal() {
Available Updates:
${fullUpdateInfo.new_versions.map((version, index) => ` -
-

-

-
+
${version.announcement.title}

${version.announcement.message}

${version.compatibility.breaking_changes ? ` @@ -363,27 +365,7 @@ async function showUpdateModal() { } modalBody.insertAdjacentHTML('beforeend', detailedVersionsHtml); - // Apply dark mode styling if active - if (isDarkMode) { - var accordionItems = document.querySelectorAll("#versionsAccordion .accordion-item"); - accordionItems.forEach((item) => { - item.style.color = "var(--md-sys-color-on-surface)"; - item.style.backgroundColor = "var(--md-sys-color-surface-5)"; - item.style.border = "1px solid var(--md-sys-color-outline-variant)"; - }); - var accordionButtons = document.querySelectorAll("#versionsAccordion .accordion-button"); - accordionButtons.forEach((button) => { - button.style.color = "var(--md-sys-color-on-surface)"; - button.style.backgroundColor = "var(--md-sys-color-surface-5)"; - button.style.borderColor = "var(--md-sys-color-outline-variant)"; - }); - var accordionBodies = document.querySelectorAll("#versionsAccordion .accordion-body"); - accordionBodies.forEach((body) => { - body.style.color = "var(--md-sys-color-on-surface)"; - body.style.backgroundColor = "var(--md-sys-color-surface-5)"; - }); - } - } else { + } else { // Remove loading spinner if failed to load const spinner = document.getElementById('loadingSpinner'); if (spinner) { From 2ad72f816be672c28f5c53b3e7ba623a8803fc7b Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:29:35 +0100 Subject: [PATCH 3/3] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1c18c0fb6..6f36a814f 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ repositories { allprojects { group = 'stirling.software' - version = '1.0.0' + version = '1.1.2' configurations.configureEach { exclude group: 'commons-logging', module: 'commons-logging'