From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 6 May 2019 18:28:51 +0000 (+0200)
Subject: wip #2691 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5b1663d833a030bdc9e39de4ed826f08bb48e954;p=fluidbook-html5.git

wip #2691 @2
---

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index f643ff97..60efd428 100644
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -539,17 +539,9 @@ FluidbookLoader.prototype = {
             width = 100;
         }
 
-        left = ((page % 2 == 0) && this.fluidbook.l10n.ltr) || ((page % 2 == 1) && this.fluidbook.l10n.rtl);
+        left = ((page % 2 === 0) && this.fluidbook.l10n.ltr) || ((page % 2 == 1) && this.fluidbook.l10n.rtl);
 
         var h = width * (this.fluidbook.datas.thumbHeight / 100);
-        var s = Math.floor((page - 1) / width);
-        var row = Math.floor(((page - (s * width)) - 1) / 10);
-        var col = (page - 1) % 10;
-        if (col < 0) {
-            col += 10;
-        }
-        var spriteleft = col * width;
-        var spritetop = row * h;
 
         var shadeImage = '';
         var shadePosition = '';
@@ -568,15 +560,9 @@ FluidbookLoader.prototype = {
             shadeSize = (width / 2) + 'px ' + h + 'px,';
         }
 
-        var thumbImage = 'url("data/thumbnails/s' + s + '.jpg")';
-        var thumbPosition = (-spriteleft) + 'px ' + (-spritetop) + 'px';
-        var thumbSize = 'auto auto';
-
-        if (width !== 100) {
-            thumbImage = 'url("data/background/150/t' + page + '.jpg")';
-            thumbPosition = '0px 0px';
-            thumbSize = '100% 100%';
-        }
+        var thumbImage = 'url("data/thumbnails/p' + page + '.jpg")';
+        var thumbPosition = '0px 0px';
+        var thumbSize = '100% 100%';
 
         $(div).css({
             backgroundImage: shadeImage + thumbImage,
diff --git a/style/fluidbook.less b/style/fluidbook.less
index e86ce04d..8a6444e4 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -1487,6 +1487,7 @@ html.ios body.portrait #interface {
 
           .img {
             position: relative;
+
             width: @w;
             height: @w/@book-page-ratio;
 
@@ -1806,14 +1807,14 @@ form input[type="text"], form input[type="email"] {
   .img {
     width: 100px;
     height: @thumb-height;
-    background-color: transparent;
+    background-color: #fff;
     position: relative;
     z-index: 1;
-    background-blend-mode: normal, overlay;
+    //background-blend-mode: normal, overlay;
     // Fix #2631
-    .android.chrome & {
-      background-blend-mode: normal, normal;
-    }
+    //.android.chrome & {
+    //  background-blend-mode: normal, normal;
+    //}
 
     background-repeat: no-repeat;
   }