]> _ Git - fluidbook-html5.git/commitdiff
fix #1730 @1
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 24 Oct 2018 12:36:43 +0000 (14:36 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 24 Oct 2018 12:36:43 +0000 (14:36 +0200)
js/libs/fluidbook/fluidbook.zoom.js
style/fluidbook.less

index 8e8015a9acaca267cb3c6d2bd9935dc6fbac961f..d1d40ce87cc9dd0afa5b9641a45196b5f3e11f14 100644 (file)
@@ -170,20 +170,21 @@ FluidbookZoom.prototype = {
 
         if (this.zoom != 1) {
             this.fluidbook.help.hide(); // Hide the help view if it's showing
-            $("#shadow").hide();
+            $("#shadow").addClass('hidden');
 
             if (!$('header').hasClass('hidden')) {
                 $(hiddenElements).addClass('hidden');
                 this.hideInterfaceTimeout = setTimeout(function () {
                     $(hiddenElements).hide();
-                    $("#shadow").addClass('hidden');
                 }, 500);
             }
         } else {
-
             clearTimeout(this.hideInterfaceTimeout);
             $(hiddenElements).show().removeClass('hidden');
-            $("#shadow").show().removeClass('hidden');
+            setTimeout(function () {
+                $("#shadow").removeClass('hidden');
+            }, 250);
+
         }
         $("#z").transform(animation, {preserve: true});
         $this.triggerEvent(((this.zoom == 1) ? 'out' : 'in') + '.start');
index 61aa35a429e96677e521aa1ac59e1e71aff88a77..6435f758f2c7fe4ee3bb456dd27f62f502b008f5 100644 (file)
@@ -391,6 +391,14 @@ body, html {
        pointer-events: none;
        mix-blend-mode: multiply;
 
+       transition-property: opacity;
+       transition-duration: 250s;
+
+       &.hidden {
+               transition-duration: 50ms;
+               opacity: 0;
+       }
+
        > .shadow {
                position: absolute;
                left: 0;