]> _ Git - fluidbook-html5.git/commitdiff
fix #1456 @0:20
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 7 Jun 2017 11:01:14 +0000 (13:01 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 7 Jun 2017 11:01:14 +0000 (13:01 +0200)
js/libs/fluidbook/fluidbook.menu.js
style/fluidbook.less

index 2932b6d6e8fa086a30d3eb055499f32c6e34f7ff..735d6c8cd12ee1d0f03bfe2daf089d24d4118112 100644 (file)
@@ -412,21 +412,16 @@ FluidbookMenu.prototype = {
         }
 
 
-        var to = {
-            translateY: $(window).height() + 'px'
-        };
-        if ($(mview).hasClass('hori')) {
-            to = {translateX: $(window).width() + 'px'}
+        if(mview.length>0) {
+            TweenMax.to(mview, 0.25, {
+                autoAlpha: 0, onComplete: function () {
+                    $this.fluidbook.video.killVideosIn(mview);
+                    mview.remove();
+                    callback();
+                }
+            });
         }
 
-        TweenMax.to(mview, 0.25, {
-            autoAlpha: 0, onComplete: function () {
-                $this.fluidbook.video.killVideosIn(mview);
-                mview.remove();
-                callback();
-            }
-        });
-
 
         if (all) {
             $("#main").show();
@@ -436,7 +431,6 @@ FluidbookMenu.prototype = {
     },
 
     resize: function (ww, hh) {
-
         if (ww == undefined) {
             ww = this.fluidbook.resize.ww;
         }
index b15c403dde305f171b5a3531c82d35cd10c43cb1..ebfab845377a2555974bc5c16b7da4e22f0e96de 100644 (file)
@@ -858,7 +858,7 @@ footer.hidden, header.hidden, #interface.hidden {
 
        }
 
-       &[data-menu="webvideo"],&[data-menu="webvideo"] {
+       &[data-menu="webvideo"], &[data-menu="webvideo"] {
                iframe {
                        width: 100%;
                        height: 100%;
@@ -1444,7 +1444,7 @@ ul.chapters {
                .puce {
                        width: 25px;
                        height: 25px;
-                       line-height:17px;
+                       line-height: 17px;
                        padding: 6px;
                        color: #fff;
                        svg {
@@ -2041,6 +2041,13 @@ a.button {
        }
 }
 
+/* Blur input */
+body > input {
+       position: absolute;
+       bottom: 0;
+       left: 0;
+}
+
 /* SVG Sprite */
 [class^="interface-"], [class*=" interface-"] {
        display: inline-block;