]> _ Git - fluidbook-html5.git/commitdiff
try #2833 @1
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 14 Jun 2019 12:55:23 +0000 (14:55 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 14 Jun 2019 12:55:23 +0000 (14:55 +0200)
js/libs/fluidbook/fluidbook.touch.js
style/fluidbook.less

index 4d72e1b1e067056a07f5173d825046dbe0fe1ff2..c95417509996de1e34e1be15b56c07357f6d119a 100644 (file)
@@ -173,6 +173,9 @@ FluidbookTouch.prototype = {
         if (end === undefined) {
             end = false;
         }
+        if ($(".mview:visible").length > 0) {
+            return false;
+        }
         if (this.fluidbook.zoom.zoom === 1) {
             if (this.fluidbook.mobilefirst.enabled) {
                 return false;
index 356cb45a163cf35c9c6e852a46e0effce2a55e56..2884ac66cce7e49136b0811e1d8105d4f260cf02 100644 (file)
@@ -79,7 +79,7 @@ img {
   box-sizing: content-box;
   -moz-box-sizing: content-box;
   -webkit-box-sizing: content-box;
-  -ms-box-sizing: content-box;
+  ifra -ms-box-sizing: content-box;
   -o-box-sizing: content-box;
 
   -webkit-user-select: none;
@@ -1511,6 +1511,10 @@ html.ios body.portrait #interface {
       &[data-type="10doigts"] {
         border-radius: 15px;
       }
+
+      .ios & {
+        overflow-y: auto;
+      }
     }
 
     .content {