From 0ab0b9e96055960d870b73d534b46e674c0526ad Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 1 Oct 2021 11:13:37 +0200 Subject: [PATCH] wait #4733 @1 --- js/libs/fluidbook/fluidbook.background.js | 2 +- js/libs/fluidbook/fluidbook.loader.js | 4 ++-- js/libs/fluidbook/fluidbook.splash.js | 6 +++--- style/fluidbook.less | 6 ++++++ style/nav-horizontal.less | 2 ++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.background.js b/js/libs/fluidbook/fluidbook.background.js index 7d6b3229..afb59803 100644 --- a/js/libs/fluidbook/fluidbook.background.js +++ b/js/libs/fluidbook/fluidbook.background.js @@ -37,7 +37,7 @@ FluidbookBackground.prototype = { style = "background-image:none !important;background-color:" + back + " !important;"; } $('#background').attr('style', style); - $("#prev-arrows,#next-arrows,#menuOpener,.audio-description-button").css('color', arrows); + $("#prev-arrows,#next-arrows,#menuOpener,.audio-description-button,#horizontalNav #iconList a .svg-icon").css('color', arrows); }); } }, diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index d933d250..796bd1ff 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -701,8 +701,8 @@ FluidbookLoader.prototype = { var upscale = this.fluidbook.settings.svgToCanvasUpscale !== undefined ? this.fluidbook.settings.svgToCanvasUpscale : 1; - var z = upscale; - var mz = this.fluidbook.zoom.max * upscale * 1.1; + var z = window.devicePixelRatio * upscale; + var mz = this.fluidbook.zoom.max * window.devicePixelRatio * upscale * 1.1; $('canvas[data-page]').each(function () { if ($this.fluidbook.zoom.zoom === 1 && $(this).hasClass('z')) { diff --git a/js/libs/fluidbook/fluidbook.splash.js b/js/libs/fluidbook/fluidbook.splash.js index f14dda1a..44fc8a3a 100644 --- a/js/libs/fluidbook/fluidbook.splash.js +++ b/js/libs/fluidbook/fluidbook.splash.js @@ -71,7 +71,7 @@ FluidbookSplash.prototype = { }, _hide: function () { - this.isHidding=true; + this.isHidding = true; var $this = this; var timeout = this.fluidbook.shortLoading ? 0 : 700; this.fluidbook.resize.resize(false, true); @@ -96,7 +96,7 @@ FluidbookSplash.prototype = { $(this.remove()); }) } - $("#background").css({opacity: 1, visibility: 'visible'}); + $("#background").addClass('visible'); setTimeout(function () { $("#splash").remove(); @@ -104,7 +104,7 @@ FluidbookSplash.prototype = { this.fluidbook.allowChangePage(); $(this.fluidbook).trigger('fluidbook.splash.hide'); - this.isHidding=false; + this.isHidding = false; }, } \ No newline at end of file diff --git a/style/fluidbook.less b/style/fluidbook.less index 7ad73dd2..7e8cc93c 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -203,6 +203,11 @@ body, html { width: 100%; height: 100%; z-index: 0; + + &.visible { + opacity: 1; + visibility: visible; + } } #background .links { @@ -264,6 +269,7 @@ body, html { &.rightContainer { left: 50%; + .mobilefirst & { left: 0; } diff --git a/style/nav-horizontal.less b/style/nav-horizontal.less index 261c9ce7..c449ea7b 100644 --- a/style/nav-horizontal.less +++ b/style/nav-horizontal.less @@ -65,6 +65,7 @@ color: @icon-color; display: inline-block; + // Styling when help overlay is open .help & { color: #ccc; @@ -87,6 +88,7 @@ margin: 0 17px; color: @icon-color; vertical-align: middle; + transition: color @page-transition-duration; .help & { color: #ccc; -- 2.39.5