From d63835710934c68dc865d3e4dd0390c4400667f3 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 19 Jun 2017 13:58:58 +0200 Subject: [PATCH] wip #1472 @1 --- js/libs/fluidbook/fluidbook.menu.js | 5 +++-- js/libs/fluidbook/fluidbook.resize.js | 12 ++++++++++-- style/fluidbook.less | 14 ++++++++++---- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js index f9ba875c..c3018e23 100644 --- a/js/libs/fluidbook/fluidbook.menu.js +++ b/js/libs/fluidbook/fluidbook.menu.js @@ -133,7 +133,8 @@ FluidbookMenu.prototype = { hits[k] += v; }); var e = encodeURIComponent($this.searchString); - $(".doubleThumb").each(function () { + $(".mview .doubleThumb").each(function () { + var pages = $(this).data('pages').toString().split(','); var hitsp = 0; var pagesWithHits = []; @@ -451,7 +452,7 @@ FluidbookMenu.prototype = { fullscreen = (w >= ww * 0.9); if (this.fluidbook.datas.chaptersCascade) { h = hh * 0.8; - forceHeight=true; + forceHeight = true; } break; case 'index': diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index c97847d7..56d256aa 100644 --- a/js/libs/fluidbook/fluidbook.resize.js +++ b/js/libs/fluidbook/fluidbook.resize.js @@ -131,6 +131,14 @@ FluidbookResize.prototype = { height: fhh }); + + if ($("#pagesnumbers").data('size') == null) { + $("#pagesnumbers").data('size', parseInt($("#pagesnumbers").css('font-size'))); + } + + var pageNumberScale = Math.min(1, 1 / (this.bookScale / 0.5)); + $("#pagesnumbers").css('font-size', $("#pagesnumbers").data('size') * pageNumberScale); + if (this.fluidbook.datas.logoHideWhenOverriden) { var availableWidthForLogo = (this.ww - fw) / 2; if ($("#logo").outerWidth() > availableWidthForLogo) { @@ -275,7 +283,7 @@ FluidbookResize.prototype = { this.fluidbook.pageTransition(); } }, - getScreenFluidbookWidth:function(){ - return $("#fluidbook").outerWidth()*fluidbook.resize.bookScale; + getScreenFluidbookWidth: function () { + return $("#fluidbook").outerWidth() * fluidbook.resize.bookScale; } }; \ No newline at end of file diff --git a/style/fluidbook.less b/style/fluidbook.less index dc4d203c..882361df 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -391,11 +391,17 @@ body, html { position: absolute; white-space: nowrap; pointer-events: none; -} + font-size: unit(13*@z, px); + margin: 0.38em 0 0 0; + top: @book-page-height; + color: @page-number-color; + .hideifnot(@display-page-number); -#pagesnumbers div { - text-align: center; - display: inline-block; + > div { + width: @book-page-width; + text-align: center; + display: inline-block; + } } .portrait #pagesnumbers .right { -- 2.39.5