From 4a82e262dde22c8236bdf419404e128e8ab6d29a Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 14 Dec 2016 15:30:22 +0000 Subject: [PATCH] #1031 --- js/libs/fluidbook/fluidbook.resize.js | 11 +++++++++++ style/fluidbook.css | 10 ++++++++++ style/fluidbook.less | 11 +++++++++++ 3 files changed, 32 insertions(+) diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index bc07b802..e2d69662 100644 --- 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 73dedbac..0268c7e1 100644 --- 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 ce41c3b4..14c9d758 100644 --- 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 { -- 2.39.5