From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 18 Oct 2017 15:46:28 +0000 (+0200)
Subject: #1759
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9b01f32ca71532ec6ff3659ce5ed909c9dfa9d48;p=fluidbook-html5.git

#1759
---

diff --git a/js/libs/fluidbook/fluidbook.background.js b/js/libs/fluidbook/fluidbook.background.js
index 0a14f0c0..6a785b84 100644
--- a/js/libs/fluidbook/fluidbook.background.js
+++ b/js/libs/fluidbook/fluidbook.background.js
@@ -19,6 +19,11 @@ FluidbookBackground.prototype = {
             return;
         }
 
+        // Don't scale links if there is tabs (tabs have their own resize process)
+        if($("#background").find('.tabslink').length>0){
+            return;
+        }
+
         var left, top, iw, ih;
 
         if (this.fluidbook.datas.backgroundImageDimensions == undefined) {
diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js
index d09a5073..6d162edd 100644
--- a/js/libs/fluidbook/fluidbook.resize.js
+++ b/js/libs/fluidbook/fluidbook.resize.js
@@ -1,12 +1,8 @@
 function FluidbookResize(fluidbook) {
     this.fluidbook = fluidbook;
-    var marginX = 60;
-    var marginY = 20;
 
-    this.marginleft = marginX + parseInt(this.fluidbook.datas.extraXSpace);
-    this.margintop = marginY + parseInt(this.fluidbook.datas.extraYSpace);
-    this.marginbottom = marginY + 20;
-    this.marginright = marginX;
+    this.setMargins();
+
     this.corr = 0.8;
     this.referenceWidthLandscape = 1024;
     this.referenceWidthPortrait = 400;
@@ -23,6 +19,16 @@ function FluidbookResize(fluidbook) {
 }
 
 FluidbookResize.prototype = {
+    setMargins: function () {
+        var marginX = 60;
+        var marginY = 20;
+
+        this.marginleft = marginX + parseInt(this.fluidbook.datas.extraXSpace);
+        this.margintop = marginY + parseInt(this.fluidbook.datas.extraYSpace);
+        this.marginbottom = marginY + 20;
+        this.marginright = marginX;
+    },
+
     init: function () {
 
         // Manage transform origins based on text direction
diff --git a/style/fluidbook.less b/style/fluidbook.less
index 8dc9c8f5..0fb168be 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -2313,8 +2313,9 @@ body > input {
 	.tabs {
 		transition: opacity 400ms;
 		position: relative;
-		&.hidezoomin, &.hideportrait, &.hidelastpage, &.hidefirstpage {
+		&.hide {
 			opacity: 0;
+			pointer-events: none;
 		}
 
 		.tablink {