From bfaf28452bf53c497b131f01181837dd32734243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 24 Jan 2020 10:31:18 +0100 Subject: [PATCH] Adjust filelist color handling to new dark theme value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files/js/filelist.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 821a11804b4..274c2f231f3 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1591,6 +1591,8 @@ td.append(linkElem); tr.append(td); + var isDarkTheme = OCA.Accessibility && OCA.Accessibility.theme === 'dark' + try { var maxContrastHex = window.getComputedStyle(document.documentElement) .getPropertyValue('--color-text-maxcontrast').trim() @@ -1599,10 +1601,7 @@ } var maxContrast = parseInt(maxContrastHex.substring(1, 3), 16) } catch(error) { - var maxContrast = OCA.Accessibility - && OCA.Accessibility.theme === 'themedark' - ? 130 - : 118 + var maxContrast = isDarkTheme ? 130 : 118 } // size column @@ -1618,7 +1617,7 @@ sizeColor = maxContrast; } - if (OCA.Accessibility && OCA.Accessibility.theme === 'themedark') { + if (isDarkTheme) { sizeColor = Math.abs(sizeColor); // ensure that the dimmest color is still readable // min. color contrast for normal text on black background according to WCAG AA @@ -1646,7 +1645,7 @@ modifiedColor = maxContrast; } - if (OCA.Accessibility && OCA.Accessibility.theme === 'themedark') { + if (isDarkTheme) { modifiedColor = Math.abs(modifiedColor); // ensure that the dimmest color is still readable