From f9be9f98ce4d0389085aaa0f8efce34a16c2639a Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Sun, 15 Oct 2023 16:18:00 +0400 Subject: [PATCH] Fixed the fonts in the viewer UI language selector --- static/skin/taskbar.css | 11 +++++++++++ test/server.cpp | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/static/skin/taskbar.css b/static/skin/taskbar.css index 2352fe34d..865c8c6f9 100644 --- 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 index f32e7ce82..e66a9e0c0 100644 --- 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( +R"EXPECTEDRESULT(