From fd504c1166e476095864c3fdc2ff28e84a6565d2 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Sat, 28 Oct 2023 21:03:36 +0400 Subject: [PATCH] Matched viewer toolbar color to that of the library page Attempts to use the same color for buttons yielded poor results: viewer toolbar buttons don't look nice on the dark background used for the filter controls on the library page, whereas the light background of the viewer toolbar buttons doesn't play well with the filters on the library page which seem to be designed around the contrast effect. --- static/skin/taskbar.css | 6 +++--- test/server.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/static/skin/taskbar.css b/static/skin/taskbar.css index 8159ea9f1..81e8f6160 100644 --- a/static/skin/taskbar.css +++ b/static/skin/taskbar.css @@ -3,7 +3,7 @@ transition: 0.3s; width: 100%; box-sizing: border-box; - background: #e3e3e3; + background: #f4f6f8; border-bottom: 1px solid #aaa; } @@ -88,7 +88,7 @@ label[for="kiwix_button_show_toggle"], line-height: 20px !important; margin-right: 5px !important; padding: 2px 6px !important; - border: 1px solid #999 !important; + border: 1px solid #b5b2b2 !important; border-radius: 3px !important; background-color: #ededed !important; font-weight: normal !important; @@ -102,7 +102,7 @@ label[for="kiwix_button_show_toggle"], width: 100%; height: 26px !important; line-height: 20px !important; - border: 1px solid #999 !important; + border: 1px solid #b5b2b2 !important; border-radius: 3px !important; background-color: #fff !important; padding: 2px 2px 2px 27px !important; diff --git a/test/server.cpp b/test/server.cpp index 38bdc48af..703f1d5d0 100644 --- a/test/server.cpp +++ b/test/server.cpp @@ -73,7 +73,7 @@ const ResourceCollection resources200Compressible{ { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/mustache.min.js" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/mustache.min.js?cacheid=bd23c4fb" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css" }, - { STATIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css?cacheid=8c05f7fc" }, + { STATIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css?cacheid=a1200d6b" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/viewer.js" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/viewer.js?cacheid=201653b8" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Poppins.ttf" }, @@ -316,7 +316,7 @@ R"EXPECTEDRESULT( - +