diff --git a/static/skin/i18n.js b/static/skin/i18n.js index 72d7d3b20..d451f11b4 100644 --- a/static/skin/i18n.js +++ b/static/skin/i18n.js @@ -92,8 +92,7 @@ function getUserLanguage() { } function setUserLanguage(lang, callback) { - const rootPath = new URL('..', import.meta.url).pathname.replace(/\/$/, ''); - document.cookie = `userlang=${lang};path=${rootPath};max-age=31536000`; + setPermanentGlobalCookie('userlang', lang); Translations.load(lang); Translations.whenReady(callback); } diff --git a/static/skin/taskbar.css b/static/skin/taskbar.css index 332bd2444..87fbdc319 100644 --- a/static/skin/taskbar.css +++ b/static/skin/taskbar.css @@ -44,8 +44,8 @@ margin: 0 auto; } -#ui_language { - float: left +.kiwix #ui_language { + float: left; } #kiwix_button_show_toggle { @@ -84,6 +84,7 @@ label[for="kiwix_button_show_toggle"], float: right; } +.kiwix #ui_language, .kiwix #kiwixtoolbar button, .kiwix #kiwixtoolbar input[type="submit"] { box-sizing: border-box !important; diff --git a/static/skin/viewer.js b/static/skin/viewer.js index b4fe88a9f..db7bc2ba8 100644 --- a/static/skin/viewer.js +++ b/static/skin/viewer.js @@ -198,7 +198,10 @@ function updateToolbarVisibilityState() { } function handle_visual_viewport_change() { - contentIframe.height = window.visualViewport.height - contentIframe.offsetTop - 4; + const wh = window.visualViewport + ? window.visualViewport.height + : window.innerHeight; + contentIframe.height = wh - contentIframe.offsetTop - 4; } function handle_location_hash_change() { @@ -512,3 +515,7 @@ function finishViewerSetupOnceTranslationsAreLoaded() viewerSetupComplete = true; } + +function setPermanentGlobalCookie(name, value) { + document.cookie = `${name}=${value};path=${root};max-age=31536000`; +} diff --git a/static/viewer.html b/static/viewer.html index 1eba63657..4c66abbcd 100644 --- a/static/viewer.html +++ b/static/viewer.html @@ -29,7 +29,7 @@