diff --git a/src/webui/www/private/css/Layout.css b/src/webui/www/private/css/Layout.css index f6d2c8343..33b05a35f 100644 --- a/src/webui/www/private/css/Layout.css +++ b/src/webui/www/private/css/Layout.css @@ -1,5 +1,3 @@ -@import url("palette.css"); - /* Core.css for Mocha UI diff --git a/src/webui/www/private/css/Tabs.css b/src/webui/www/private/css/Tabs.css index 61080dc87..3787a6c13 100644 --- a/src/webui/www/private/css/Tabs.css +++ b/src/webui/www/private/css/Tabs.css @@ -1,5 +1,3 @@ -@import url("palette.css"); - /* Tabs.css for Mocha UI diff --git a/src/webui/www/private/css/Window.css b/src/webui/www/private/css/Window.css index 2149edfdb..9a71df8e3 100644 --- a/src/webui/www/private/css/Window.css +++ b/src/webui/www/private/css/Window.css @@ -1,5 +1,3 @@ -@import url("palette.css"); - /* Window.css for Mocha UI diff --git a/src/webui/www/private/css/dynamicTable.css b/src/webui/www/private/css/dynamicTable.css index 83280c543..421c19759 100644 --- a/src/webui/www/private/css/dynamicTable.css +++ b/src/webui/www/private/css/dynamicTable.css @@ -1,5 +1,3 @@ -@import url("palette.css"); - /************************************************************** Dynamic Table diff --git a/src/webui/www/private/css/palette.css b/src/webui/www/private/css/palette.css deleted file mode 100644 index 1ef40f38a..000000000 --- a/src/webui/www/private/css/palette.css +++ /dev/null @@ -1,58 +0,0 @@ -/* Adaptive color palette */ - -/* Default rules */ -* { - --color-accent-blue: hsl(210deg 65% 55%); - --color-text-blue: hsl(210deg 100% 55%); - --color-text-orange: hsl(26deg 100% 45%); - --color-text-red: hsl(0deg 100% 65%); - --color-text-green: hsl(110deg 94% 27%); - --color-text-white: hsl(0deg 0% 100%); - --color-text-disabled: hsl(0deg 0% 60%); - --color-text-default: hsl(0deg 0% 33%); - --color-background-blue: hsl(210deg 65% 55%); - --color-background-popup: hsl(0deg 0% 100%); - --color-background-default: hsl(0deg 0% 94%); - --color-background-hover: hsl(26deg 80% 60%); - --color-border-blue: hsl(210deg 42% 48%); - --color-border-default: hsl(0deg 0% 85%); - --color-icon-hover: brightness(0) invert(100%) sepia(100%) saturate(0%) - hue-rotate(108deg) brightness(104%) contrast(104%); -} - -:root { - color-scheme: light dark; -} - -/* Light corrections */ -@media (prefers-color-scheme: light) { - :root { - color-scheme: light; - } -} - -/* Dark corrections */ -@media (prefers-color-scheme: dark) { - :root { - color-scheme: dark; - } - - * { - --color-accent-blue: hsl(210deg 42% 48%); - --color-text-blue: hsl(210deg 88.1% 73.5%); - --color-text-orange: hsl(26deg 65% 70%); - --color-text-default: hsl(0deg 0% 90%); - --color-background-blue: hsl(210deg 42% 48%); - --color-background-popup: hsl(0deg 0% 20%); - --color-background-default: hsl(0deg 0% 25%); - --color-background-hover: hsl(26deg 50% 55%); - --color-border-default: hsl(0deg 0% 33%); - } - - #rssButtonBar img, - #startSearchButton img, - #manageSearchPlugins img { - filter: brightness(0) saturate(100%) invert(100%) sepia(0%) saturate(1%) - hue-rotate(156deg) brightness(106%) contrast(101%); - } -} diff --git a/src/webui/www/private/css/style.css b/src/webui/www/private/css/style.css index db7917cef..b3120fa61 100644 --- a/src/webui/www/private/css/style.css +++ b/src/webui/www/private/css/style.css @@ -1,4 +1,61 @@ -@import url("palette.css"); +/* Adaptive color palette */ + +/* Default rules */ +* { + --color-accent-blue: hsl(210deg 65% 55%); + --color-text-blue: hsl(210deg 100% 55%); + --color-text-orange: hsl(26deg 100% 45%); + --color-text-red: hsl(0deg 100% 65%); + --color-text-green: hsl(110deg 94% 27%); + --color-text-white: hsl(0deg 0% 100%); + --color-text-disabled: hsl(0deg 0% 60%); + --color-text-default: hsl(0deg 0% 33%); + --color-background-blue: hsl(210deg 65% 55%); + --color-background-popup: hsl(0deg 0% 100%); + --color-background-default: hsl(0deg 0% 94%); + --color-background-hover: hsl(26deg 80% 60%); + --color-border-blue: hsl(210deg 42% 48%); + --color-border-default: hsl(0deg 0% 85%); + --color-icon-hover: brightness(0) invert(100%) sepia(100%) saturate(0%) + hue-rotate(108deg) brightness(104%) contrast(104%); +} + +:root { + color-scheme: light dark; +} + +/* Light corrections */ +@media (prefers-color-scheme: light) { + :root { + color-scheme: light; + } +} + +/* Dark corrections */ +@media (prefers-color-scheme: dark) { + :root { + color-scheme: dark; + } + + * { + --color-accent-blue: hsl(210deg 42% 48%); + --color-text-blue: hsl(210deg 88.1% 73.5%); + --color-text-orange: hsl(26deg 65% 70%); + --color-text-default: hsl(0deg 0% 90%); + --color-background-blue: hsl(210deg 42% 48%); + --color-background-popup: hsl(0deg 0% 20%); + --color-background-default: hsl(0deg 0% 25%); + --color-background-hover: hsl(26deg 50% 55%); + --color-border-default: hsl(0deg 0% 33%); + } + + #rssButtonBar img, + #startSearchButton img, + #manageSearchPlugins img { + filter: brightness(0) saturate(100%) invert(100%) sepia(0%) saturate(1%) + hue-rotate(156deg) brightness(106%) contrast(101%); + } +} /* Reset */ diff --git a/src/webui/www/private/css/vanillaSelectBox.css b/src/webui/www/private/css/vanillaSelectBox.css index 80727e843..8191e5f17 100644 --- a/src/webui/www/private/css/vanillaSelectBox.css +++ b/src/webui/www/private/css/vanillaSelectBox.css @@ -1,5 +1,3 @@ -@import url("palette.css"); - .hidden-search { display: none !important; } diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index b168b81b3..2e1c96a3d 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -14,7 +14,6 @@ - diff --git a/src/webui/www/webui.qrc b/src/webui/www/webui.qrc index 32912b6be..1e8501d63 100644 --- a/src/webui/www/webui.qrc +++ b/src/webui/www/webui.qrc @@ -11,7 +11,6 @@ private/css/dynamicTable.css private/css/Layout.css private/css/noscript.css - private/css/palette.css private/css/style.css private/css/Tabs.css private/css/vanillaSelectBox.css