From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 17 Jan 2018 17:24:43 +0000 (+0100)
Subject: try #1584 @4
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7727f201e7f1329122af7dc20ef48b24cb830794;p=fluidbook-html5.git

try #1584 @4
---

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 1fad66fa..9fe416c1 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -187,7 +187,7 @@ Fluidbook.prototype = {
             return;
         }
         $(doublePage).find('.' + position).remove();
-        var page = '<div class="page ' + position + '" id="page_' + pageNr + '" data-page="' + pageNr + '"><div class="background" page="' + pageNr + '"></div><div class="clinks"></div><div class="texts" highlight=""></div><div class="shade"></div></div>';
+        var page = '<div class="page ' + position + '" id="page_' + pageNr + '" data-page="' + pageNr + '"><div class="background" page="' + pageNr + '"></div><div class="texts" highlight=""></div><div class="clinks"></div><div class="shade"></div></div>';
         $(doublePage).append(page);
     },
     hidePage: function (position) {
diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 645b3759..4540e08e 100644
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -169,9 +169,6 @@ FluidbookLoader.prototype = {
         this.fluidbook.initPage(pageNr, doublePage, position);
         var version = this.getVersionToLoad(parseInt(pageNr));
         page = $("#page_" + pageNr);
-        if (version == 'vector') {
-            $(page).addClass('transparentbg');
-        }
         $(doublePage).append(page);
         $(page).show();
         $(page).addClass(position);
@@ -267,9 +264,9 @@ FluidbookLoader.prototype = {
         }
     },
     _loadTexts: function (pageNr, callback) {
-        var w = this.fluidbook.datas.width / 0.75;
-        var h = this.fluidbook.datas.height / 0.75;
-        this.texts[pageNr] = this.loadImage(this.getTextsURL(pageNr), w, h, 'image/svg+xml', callback);
+        // var w = this.fluidbook.datas.width / 0.75;
+        // var h = this.fluidbook.datas.height / 0.75;
+        this.texts[pageNr] = this.loadImage(this.getTextsURL(pageNr), null, null, 'image/svg+xml', callback);
     },
     loadDatas: function (pageNr, callback) {
         var $this = this;
diff --git a/style/fluidbook.less b/style/fluidbook.less
index 656a38dc..24dff9a6 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -297,44 +297,36 @@ body, html {
 	position: absolute;
 	top: 0px;
 	background-color: #fff;
-	&.transparentbg {
-		background-color: transparent;
+	.texts {
+		position: absolute;
+		top: -1px;
+		left: -1px;
 	}
-}
-
-.page .shade {
-	position: absolute;
-	top: 0px;
-}
-
-.page.right .shade {
-	left: 0px;
-}
-
-.page.left .shade {
-	right: 0px;
-}
-
-.background, .texts, .l, .g, .s {
-	position: absolute;
-	top: 0px;
-	left: 0px;
-}
 
-.texts .g {
-	line-height: 1;
-}
+	.background{
+		position: absolute;
+		top: 0px;
+		left: 0px;
+		width: 100%;
+		height: 100%;
+	}
 
-.g, .gs, .l {
-	white-space: nowrap;
-}
+	.shade {
+		position: absolute;
+		top: 0px;
+	}
 
-.texts .gs {
-	display: inline-block;
-}
+	&.right{
+		.shade {
+			left: 0px;
+		}
+	}
 
-.o {
-	font-style: oblique;
+	&.left{
+		.shade{
+			right: 0px;
+		}
+	}
 }
 
 .doublePage, #pages {