Merge pull request #1005 from kiwix/language_selector_font_fix

Fixed the fonts in the viewer UI language selector
kiwix · Oct 16, 2023 · da89169 · da89169
2 parents 22b55d3 + f9be9f9
commit da89169
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/static/skin/taskbar.css b/static/skin/taskbar.css
@@ -194,6 +194,7 @@ a.suggest, a.suggest:visited, a.suggest:hover, a.suggest:active {
 }
 
 #uiLanguageSelector .modal-content #ui_language {
+  font-size: 1rem;
   width: 100%;
 }
 
@@ -255,3 +256,13 @@ a.suggest, a.suggest:visited, a.suggest:hover, a.suggest:active {
         width: 80%;
     }
 }
+
+@font-face {
+  font-family: "poppins";
+  src: url("../skin/fonts/Poppins.ttf?KIWIXCACHEID") format("truetype");
+}
+
+@font-face {
+    font-family: "roboto";
+    src: url("../skin/fonts/Roboto.ttf?KIWIXCACHEID") format("truetype");
+}
diff --git a/test/server.cpp b/test/server.cpp
@@ -71,7 +71,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=bbdaf425" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/taskbar.css?cacheid=5ab04b5a" },
   { 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" },
@@ -308,7 +308,7 @@ R"EXPECTEDRESULT(                                <img src="${root}/skin/download
     },
     {
       /* url */ "/ROOT%23%3F/viewer",
-R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=bbdaf425" rel="Stylesheet" />
+R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=5ab04b5a" 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=8d132878" defer></script>