From 87eedabce9405f76e5216f351043ad00c9c42fc9 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 29 May 2019 10:50:59 +0200 Subject: [PATCH] wip #2806 @0.5 --- js/libs/fluidbook/fluidbook.links.js | 13 +++++++++- style/fluidbook.less | 39 ++++++++++------------------ 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 18fc30be..2dab278d 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -185,7 +185,7 @@ FluidbookLinks.prototype = { var links = $("#links").removeClass('right'); $(links).html('').show(); - if (this.fluidbook.displayOnePage && pageNr % 2 === 1 && this.fluidbook.l10n.dir==='ltr') { + if (this.fluidbook.displayOnePage && pageNr % 2 === 1 && this.fluidbook.l10n.dir === 'ltr') { $(links).addClass('right') } if (this.fluidbook.datas.bookmark) { @@ -193,8 +193,19 @@ FluidbookLinks.prototype = { } links.prepend('
'); + links.find('.rightContainer').html(this.fluidbook.datas.links[rightPage]); links.find('.leftContainer').html(this.fluidbook.datas.links[leftPage]); + + if (this.fluidbook.displayOnePage) { + if (pageNr !== rightPage) { + links.find('.rightContainer').hide(); + } + if (pageNr !== leftPage) { + links.find('.leftContainer').hide(); + } + } + if (links.find('.link.multimedia iframe').length > 0) { this.fluidbook.networkControl.pause(30000); } diff --git a/style/fluidbook.less b/style/fluidbook.less index 5ee0c23f..9f972356 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -188,35 +188,19 @@ body, html { } /* Desktop devices */ - -.msie { - &.desktop { - #links .nonlinkarea { - cursor: url(./images/cursors/zoom-in.cur), auto; - } - - .zoomed { - #links .nonlinkarea { - cursor: url(./images/cursors/zoom-out.cur), auto; - } - } +&.using-mouse body:not(.zoom-disabled) { + #links .container { + cursor: zoom-in; } -} -&.no-msie { - &.desktop { - #links .nonlinkarea { - cursor: zoom-in; - } - - .zoomed { - #links .nonlinkarea { - cursor: zoom-out; - } + &.zoomed { + #links .container { + cursor: zoom-out; } } } + #links { .container { position: absolute; @@ -225,7 +209,11 @@ body, html { height: @book-page-height; &.rightContainer { - left: @book-page-width; + left: @book-page-width; + + .mobilefirst & { + left: 0; + } } } } @@ -1226,7 +1214,7 @@ html.ios body.portrait #interface { background-color: rgba(0, 0, 0, 0.001); } -.rtl #links { +.rtl #links { .leftContainer { left: 50%; } @@ -1321,7 +1309,6 @@ html.ios body.portrait #interface { top: 0px; left: 0px; display: block; - cursor: zoom-in; .zoom-disabled & { cursor: auto !important; -- 2.39.5