#1031

diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js
index bc07b802bae882f1a5ee0f7418d13e5649ed3b77..e2d6966217afa0cba9673aaa6f1ffcf82d006024 100644 (file)
--- a/js/libs/fluidbook/fluidbook.resize.js
+++ b/js/libs/fluidbook/fluidbook.resize.js
@@ -77,6 +77,8 @@ FluidbookResize.prototype = {
             this.fluidbook.viewport.updateViewport();
         }
 
+
+
         var navScale = interfaceScale * parseInt(this.fluidbook.datas.mobileNavScale) / 100;
         var cssInterfaceScale = [interfaceScale, interfaceScale];
         var cssNavScale = [navScale, navScale];
@@ -134,6 +136,15 @@ FluidbookResize.prototype = {
             height: fhh
         });
 
+        if(this.fluidbook.datas.logoHideWhenOverriden){
+            var availableWidthForLogo=(this.ww-fw)/2;
+            if($("#logo").outerWidth()>availableWidthForLogo){
+                $("#logo").addClass('overridenByFluidbook');
+            }else{
+                $("#logo").removeClass('overridenByFluidbook');
+            }
+        }
+
 
         $("#next").transform({
             scale: cssInterfaceScale,

diff --git a/style/fluidbook.css b/style/fluidbook.css
index 73dedbac3e23a8725c0755615bb974c4adb84b72..0268c7e116b38904f116bd1a51b77e9593b40df1 100644 (file)
--- a/style/fluidbook.css
+++ b/style/fluidbook.css
@@ -159,6 +159,13 @@ a {
 #links .link {
   cursor: auto;
 }
+.link {
+  -webkit-transform-origin: 0 0 0;
+  -moz-transform-origin: 0 0 0;
+  -ms-transform-origin: 0 0 0;
+  -o-transform-origin: 0 0 0;
+  transform-origin: 0 0 0;
+}
 /* Coquillette */
 #coquillette {
   position: absolute;
@@ -493,6 +500,9 @@ header {
   background-repeat: no-repeat;
   z-index: 10;
 }
+#logo.overridenByFluidbook {
+  visibility: hidden;
+}
 .ltr #logo {
   right: 0px;
 }

diff --git a/style/fluidbook.less b/style/fluidbook.less
index ce41c3b46e196883a58d0c63100f13f321649764..14c9d758bf1a30986020808fae857c1c3cd86a51 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -181,6 +181,14 @@ a {
        cursor: auto;
 }
 
+.link {
+       -webkit-transform-origin: 0 0 0;
+       -moz-transform-origin: 0 0 0;
+       -ms-transform-origin: 0 0 0;
+       -o-transform-origin: 0 0 0;
+       transform-origin: 0 0 0;
+}
+
 /* Coquillette */
 #coquillette {
        position: absolute;
@@ -562,6 +570,9 @@ header {
        top: 0px;
        background-repeat: no-repeat;
        z-index: 10;
+       &.overridenByFluidbook {
+               visibility: hidden;
+       }
 }
 
 .ltr #logo {