Skip to content

Commit

Permalink
Matched viewer toolbar color to that of the library page
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
veloman-yunkan committed Oct 28, 2023
1 parent 0c05af6 commit fd504c1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions static/skin/taskbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
transition: 0.3s;
width: 100%;
box-sizing: border-box;
background: #e3e3e3;
background: #f4f6f8;
border-bottom: 1px solid #aaa;
}

Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions test/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down Expand Up @@ -316,7 +316,7 @@ R"EXPECTEDRESULT( <img src="${root}/skin/download
{
/* url */ "/ROOT%23%3F/viewer",
R"EXPECTEDRESULT( <link type="text/css" href="./skin/kiwix.css?cacheid=9b1b089f" rel="Stylesheet" />
<link type="text/css" href="./skin/taskbar.css?cacheid=8c05f7fc" rel="Stylesheet" />
<link type="text/css" href="./skin/taskbar.css?cacheid=a1200d6b" rel="Stylesheet" />
<link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
<script type="module" src="./skin/i18n.js?cacheid=6a8c6fb2" defer></script>
<script type="text/javascript" src="./skin/languages.js?cacheid=96f2cf73" defer></script>
Expand Down

0 comments on commit fd504c1

Please sign in to comment.