mirror of https://github.com/kiwix/libkiwix.git
Deduplicated styling of UI language selector
There was a slight difference (between index.css and taskbar.css) in the margin values of the UI language selector button, however the values taken from taskbar.css don't seem to have any visible impact on the welcome/library page (controlled by index.css).
This commit is contained in:
parent
0c0b1f5971
commit
0c05af658d
|
@ -140,29 +140,6 @@
|
||||||
font-weight: bolder;
|
font-weight: bolder;
|
||||||
}
|
}
|
||||||
|
|
||||||
#uiLanguageSelector {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#uiLanguageSelector .modal {
|
|
||||||
height: 140px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#uiLanguageSelector .modal-heading {
|
|
||||||
height: 40%;
|
|
||||||
}
|
|
||||||
|
|
||||||
#uiLanguageSelector .modal-content #ui_language {
|
|
||||||
font-size: 1.6rem;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
#uiLanguageSelectorButton {
|
|
||||||
margin: 0 12px 0 0;
|
|
||||||
float: right;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.book__list {
|
.book__list {
|
||||||
position: relative;
|
position: relative;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
|
@ -395,7 +372,7 @@
|
||||||
width: auto;
|
width: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.feedLogo, #uiLanguageSelectorButton {
|
.feedLogo {
|
||||||
height: 30px;
|
height: 30px;
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,6 +72,30 @@ body {
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#uiLanguageSelector {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#uiLanguageSelector .modal {
|
||||||
|
height: 140px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#uiLanguageSelector .modal-heading {
|
||||||
|
height: 40%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#uiLanguageSelector .modal-content #ui_language {
|
||||||
|
font-size: 1.6rem;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#uiLanguageSelectorButton {
|
||||||
|
margin: 0px 12px 6px 12px;
|
||||||
|
float: right;
|
||||||
|
cursor: pointer;
|
||||||
|
height: 30px;
|
||||||
|
}
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "poppins";
|
font-family: "poppins";
|
||||||
src: url("../skin/fonts/Poppins.ttf?KIWIXCACHEID") format("truetype");
|
src: url("../skin/fonts/Poppins.ttf?KIWIXCACHEID") format("truetype");
|
||||||
|
|
|
@ -131,30 +131,6 @@ a.suggest, a.suggest:visited, a.suggest:hover, a.suggest:active {
|
||||||
column-count: 1 !important;
|
column-count: 1 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
#uiLanguageSelector {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#uiLanguageSelector .modal {
|
|
||||||
height: 140px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#uiLanguageSelector .modal-heading {
|
|
||||||
height: 40%;
|
|
||||||
}
|
|
||||||
|
|
||||||
#uiLanguageSelector .modal-content #ui_language {
|
|
||||||
font-size: 1.6rem;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
#uiLanguageSelectorButton {
|
|
||||||
margin: 0px 12px 6px 12px;
|
|
||||||
float: right;
|
|
||||||
cursor: pointer;
|
|
||||||
height: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media(min-width:420px) {
|
@media(min-width:420px) {
|
||||||
.kiwix_button_cont {
|
.kiwix_button_cont {
|
||||||
display: inline-block !important;
|
display: inline-block !important;
|
||||||
|
|
|
@ -1028,12 +1028,12 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
|
||||||
" <title>Welcome to Kiwix Server</title>\n" \
|
" <title>Welcome to Kiwix Server</title>\n" \
|
||||||
" <link\n" \
|
" <link\n" \
|
||||||
" type=\"text/css\"\n" \
|
" type=\"text/css\"\n" \
|
||||||
" href=\"/ROOT%23%3F/skin/kiwix.css?cacheid=bdae4d22\"\n" \
|
" href=\"/ROOT%23%3F/skin/kiwix.css?cacheid=9b1b089f\"\n" \
|
||||||
" rel=\"Stylesheet\"\n" \
|
" rel=\"Stylesheet\"\n" \
|
||||||
" />\n" \
|
" />\n" \
|
||||||
" <link\n" \
|
" <link\n" \
|
||||||
" type=\"text/css\"\n" \
|
" type=\"text/css\"\n" \
|
||||||
" href=\"/ROOT%23%3F/skin/index.css?cacheid=081e1606\"\n" \
|
" href=\"/ROOT%23%3F/skin/index.css?cacheid=4196ad7d\"\n" \
|
||||||
" rel=\"Stylesheet\"\n" \
|
" rel=\"Stylesheet\"\n" \
|
||||||
" />\n" \
|
" />\n" \
|
||||||
" <link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"/ROOT%23%3F/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3\">\n" \
|
" <link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"/ROOT%23%3F/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3\">\n" \
|
||||||
|
|
|
@ -61,17 +61,19 @@ const ResourceCollection resources200Compressible{
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/i18n.js" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/i18n.js" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/i18n.js?cacheid=6a8c6fb2" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/i18n.js?cacheid=6a8c6fb2" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/index.css?cacheid=081e1606" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/index.css?cacheid=4196ad7d" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/index.js?cacheid=ce19da2a" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/index.js?cacheid=ce19da2a" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" },
|
||||||
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/kiwix.css" },
|
||||||
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/kiwix.css?cacheid=9b1b089f" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/mustache.min.js" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/mustache.min.js" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/mustache.min.js?cacheid=bd23c4fb" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/mustache.min.js?cacheid=bd23c4fb" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css?cacheid=04cb5531" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css?cacheid=8c05f7fc" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/viewer.js" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/viewer.js" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/viewer.js?cacheid=201653b8" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/viewer.js?cacheid=201653b8" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Poppins.ttf" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Poppins.ttf" },
|
||||||
|
@ -140,8 +142,6 @@ const ResourceCollection resources200Uncompressible{
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/site.webmanifest?cacheid=bc396efb" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/site.webmanifest?cacheid=bc396efb" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/hash.png" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/hash.png" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/hash.png?cacheid=f836e872" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/hash.png?cacheid=f836e872" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/kiwix.css" },
|
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/kiwix.css?cacheid=bdae4d22" },
|
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/magnet.png" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/magnet.png" },
|
||||||
{ STATIC_CONTENT, "/ROOT%23%3F/skin/magnet.png?cacheid=73b6bddf" },
|
{ STATIC_CONTENT, "/ROOT%23%3F/skin/magnet.png?cacheid=73b6bddf" },
|
||||||
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/search-icon.svg" },
|
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/search-icon.svg" },
|
||||||
|
@ -276,8 +276,8 @@ TEST_F(ServerTest, CacheIdsOfStaticResources)
|
||||||
const std::vector<UrlAndExpectedResult> testData{
|
const std::vector<UrlAndExpectedResult> testData{
|
||||||
{
|
{
|
||||||
/* url */ "/ROOT%23%3F/",
|
/* url */ "/ROOT%23%3F/",
|
||||||
R"EXPECTEDRESULT( href="/ROOT%23%3F/skin/kiwix.css?cacheid=bdae4d22"
|
R"EXPECTEDRESULT( href="/ROOT%23%3F/skin/kiwix.css?cacheid=9b1b089f"
|
||||||
href="/ROOT%23%3F/skin/index.css?cacheid=081e1606"
|
href="/ROOT%23%3F/skin/index.css?cacheid=4196ad7d"
|
||||||
<link rel="apple-touch-icon" sizes="180x180" href="/ROOT%23%3F/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3">
|
<link rel="apple-touch-icon" sizes="180x180" href="/ROOT%23%3F/skin/favicon/apple-touch-icon.png?cacheid=f86f8df3">
|
||||||
<link rel="icon" type="image/png" sizes="32x32" href="/ROOT%23%3F/skin/favicon/favicon-32x32.png?cacheid=79ded625">
|
<link rel="icon" type="image/png" sizes="32x32" href="/ROOT%23%3F/skin/favicon/favicon-32x32.png?cacheid=79ded625">
|
||||||
<link rel="icon" type="image/png" sizes="16x16" href="/ROOT%23%3F/skin/favicon/favicon-16x16.png?cacheid=a986fedc">
|
<link rel="icon" type="image/png" sizes="16x16" href="/ROOT%23%3F/skin/favicon/favicon-16x16.png?cacheid=a986fedc">
|
||||||
|
@ -315,8 +315,8 @@ R"EXPECTEDRESULT( <img src="${root}/skin/download
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
/* url */ "/ROOT%23%3F/viewer",
|
/* url */ "/ROOT%23%3F/viewer",
|
||||||
R"EXPECTEDRESULT( <link type="text/css" href="./skin/kiwix.css?cacheid=bdae4d22" rel="Stylesheet" />
|
R"EXPECTEDRESULT( <link type="text/css" href="./skin/kiwix.css?cacheid=9b1b089f" rel="Stylesheet" />
|
||||||
<link type="text/css" href="./skin/taskbar.css?cacheid=04cb5531" rel="Stylesheet" />
|
<link type="text/css" href="./skin/taskbar.css?cacheid=8c05f7fc" rel="Stylesheet" />
|
||||||
<link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" 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="module" src="./skin/i18n.js?cacheid=6a8c6fb2" defer></script>
|
||||||
<script type="text/javascript" src="./skin/languages.js?cacheid=96f2cf73" defer></script>
|
<script type="text/javascript" src="./skin/languages.js?cacheid=96f2cf73" defer></script>
|
||||||
|
|
Loading…
Reference in New Issue