From 36034042f20f70ce849c7553d7cb9b8e18864608 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Wed, 11 Mar 2020 03:07:09 +0000 Subject: [PATCH] Fix styling issues with dark theme on the download page --- public/css/mango.css | 6 ++++++ public/js/download.js | 5 ++++- public/js/theme.js | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/public/css/mango.css b/public/css/mango.css index 91eaca6..e19f0c6 100644 --- a/public/css/mango.css +++ b/public/css/mango.css @@ -32,3 +32,9 @@ #selectable .ui-selected { background: #F4E487; } +#selectable .ui-selecting.dark { + background: #5E5731; +} +#selectable .ui-selected.dark { + background: #9D9252; +} diff --git a/public/js/download.js b/public/js/download.js index ee28255..3529b13 100644 --- a/public/js/download.js +++ b/public/js/download.js @@ -49,6 +49,7 @@ const download = () => { UIkit.modal.confirm(`${successCount} of ${successCount + failCount} chapters added to the download queue. Proceed to the download manager?`).then(() => { window.location.href = '/admin/downloads'; }); + styleModal(); }) .fail((jqXHR, status) => { alert('danger', `Failed to add chapters to the download queue. Error: [${jqXHR.status}] ${jqXHR.statusText}`); @@ -58,6 +59,7 @@ const download = () => { $('#download-btn').removeAttr('hidden'); }); }); + styleModal(); }; const toggleSpinner = () => { var attr = $('#spinner').attr('hidden'); @@ -275,7 +277,8 @@ const buildTable = () => { const group_str = Object.entries(chp.groups).map(([k, v]) => { return `${k}`; }).join(' | '); - return ` + const dark = getTheme() === 'dark' ? 'dark' : ''; + return ` ${chp.id} ${chp.title} ${chp.language} diff --git a/public/js/theme.js b/public/js/theme.js index b23dff1..f47f321 100644 --- a/public/js/theme.js +++ b/public/js/theme.js @@ -49,12 +49,14 @@ const setTheme = themeStr => { addClass(document.getElementsByTagName('body')[0], 'uk-light'); addClassToClass('uk-card', 'uk-card-secondary'); removeClassFromClass('uk-card', 'uk-card-default'); + addClassToClass('ui-widget-content', 'dark'); } else { document.getElementsByTagName('html')[0].style.background = ''; removeClass(document.getElementsByTagName('body')[0], 'uk-light'); removeClassFromClass('uk-card', 'uk-card-secondary'); addClassToClass('uk-card', 'uk-card-default'); + removeClassFromClass('ui-widget-content', 'dark'); } };