wait #4733 @1

diff --git a/js/libs/fluidbook/fluidbook.background.js b/js/libs/fluidbook/fluidbook.background.js
index 7d6b3229deba409ce69a8ea4eb882e4b3f3e819a..afb59803ad87dec840fa78eb3e8a518407568e7f 100644 (file)
--- 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 d933d250c9696f909d1a9556e8a7ccbfb22271a9..796bd1ffb11bef47fae9f247d5387b32e41c6015 100644 (file)
--- 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 f14dda1ae3be25115cd4198c200d1f3afe33db65..44fc8a3afae6b5c46b2d76d6954ad8347748e13b 100644 (file)
--- 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 7ad73dd230e456ffe7da42e7b1d3e34a4b3f93c5..7e8cc93c770b948ffbd958879372f32b51375229 100644 (file)
--- 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 261c9ce7e2ead920a9f5638223522e70be7b03b7..c449ea7b00d830a7f0b6fbdceb7d0f42509b49ce 100644 (file)
--- 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;