From: Vincent Vanwaelscappel Date: Tue, 28 Sep 2021 15:50:29 +0000 (+0200) Subject: wait #4718 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5fd479efb5d69e33cd9d22e617099a0e740d1c71;p=fluidbook-html5.git wait #4718 @1 --- diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index 1b0c946f..2a55ff2d 100644 --- a/js/libs/fluidbook/fluidbook.resize.js +++ b/js/libs/fluidbook/fluidbook.resize.js @@ -198,17 +198,18 @@ FluidbookResize.prototype = { this.fw = this.bookScale * this.fww; this.fh = this.bookScale * this.fhh; - this.resizeBook(); - // Hack to fix #2552 if (this.fluidbook.support.iOS && this.fluidbook.pagetransitions.getTransitionType() === 'flip3d') { // $('#fluidbook').css('transform', 'translate3d(0,0,-1px) scale(' + this.bookScale + ',' + this.bookScale + ')'); } + this.resizeBook(); if (this.fluidbook.mobilefirst.enabled) { this.fluidbook.mobilefirst.resize(); } + this.fluidbook.loader.renderTextsCanvas(); + this.centerOffset = this.fw / 4; this.fluidbook.pagetransitions.centerBook(); @@ -349,13 +350,12 @@ FluidbookResize.prototype = { $(p).find('.doublePage').css(css); this.resizeLinks(); - this.fluidbook.loader.renderTextsCanvas(); + }, resizeLinks: function () { - $('#links,.clinks,.ctlinks,#searchHighlights').css({ + $('#links .container,.clinks,.ctlinks,#searchHighlights').css({ transform: 'scale(' + this.bookScale + ')', - transformOrigin: '0 0' }); }, diff --git a/style/fluidbook.less b/style/fluidbook.less index c2bb69bf..7ad73dd2 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -263,8 +263,7 @@ body, html { height: @book-page-height; &.rightContainer { - left: @book-page-width; - + left: 50%; .mobilefirst & { left: 0; } @@ -409,6 +408,7 @@ body, html { &.z { display: none; + .zoomed & { display: block; } @@ -434,15 +434,10 @@ body, html { @book-page-width-double: @book-page-width*2; #links, #searchHighlights { - width: @book-page-width-double; - max-width: @book-page-width-double; - height: @book-page-height; - max-height: @book-page-height; - - .mobilefirst & { - width: 100%; - max-width: 100%; - } + width: 100%; + max-width: 100%; + height: 100%; + max-height: 100%; } .doublePage, #pages { @@ -450,11 +445,6 @@ body, html { max-width: 100%; height: 100%; max-height: 100%; - - .mobilefirst & { - width: 100%; - max-width: 100%; - } } .landscape { @@ -502,7 +492,7 @@ body, html { } #links.right { - left: -@book-page-width; + left: -50%; } #currentDoublePage { @@ -1329,6 +1319,10 @@ html.ios body.portrait #interface { background-color: rgba(0, 0, 0, 0.001); } +#links, #links .container, .clinks, .ctlinks, #searchHighlights { + transform-origin: 0 0 0; +} + .rtl .portrait #links { .leftContainer { left: 0;