From: Vincent Date: Tue, 5 Sep 2017 15:47:28 +0000 (+0200) Subject: wip #1466 @5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=25b6d3ed9820a097f90beda0e69ff944b203b474;p=fluidbook-html5.git wip #1466 @5 --- diff --git a/_index.html b/_index.html index 2282f71b..9ef8bde6 100644 --- a/_index.html +++ b/_index.html @@ -24,7 +24,13 @@
-
+
+ +
+
+
+
+
@@ -35,11 +41,9 @@
-
+
-
-
diff --git a/images/arrow-button.png b/images/arrow-button.png new file mode 100644 index 00000000..e4ff2f82 Binary files /dev/null and b/images/arrow-button.png differ diff --git a/images/book-shadow-left.png b/images/book-shadow-left.png index bd7456c2..7a93d5da 100644 Binary files a/images/book-shadow-left.png and b/images/book-shadow-left.png differ diff --git a/images/book-shadow-right.png b/images/book-shadow-right.png index 18ca0584..3abd6592 100644 Binary files a/images/book-shadow-right.png and b/images/book-shadow-right.png differ diff --git a/images/shade-thumb-left.png b/images/shade-thumb-left.png new file mode 100644 index 00000000..c9be4930 Binary files /dev/null and b/images/shade-thumb-left.png differ diff --git a/images/shade-thumb-right.png b/images/shade-thumb-right.png new file mode 100644 index 00000000..c66414f6 Binary files /dev/null and b/images/shade-thumb-right.png differ diff --git a/images/shadeleft-reflet.png b/images/shadeleft-reflet.png new file mode 100644 index 00000000..b41f888d Binary files /dev/null and b/images/shadeleft-reflet.png differ diff --git a/images/shaderight-reflet.png b/images/shaderight-reflet.png new file mode 100644 index 00000000..7b5dd6ef Binary files /dev/null and b/images/shaderight-reflet.png differ diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index 06ebb9b5..f05a43cc 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -538,17 +538,18 @@ Fluidbook.prototype = { } } + var s = $("#shadow,#edges"); if (left) { - $("#shadow>.left:hidden").delay(delay).fadeIn(duration); + $(s).children(".left:hidden").delay(delay).fadeIn(duration); } else { - $("#shadow>.left:visible").fadeOut(duration); + $(s).children(".left:visible").fadeOut(duration); } if (right) { - $("#shadow>.right:hidden").delay(delay).fadeIn(duration); + $(s).children(".right:hidden").delay(delay).fadeIn(duration); } else { - $("#shadow>.right:visible").fadeOut(duration); + $(s).children(".right:visible").fadeOut(duration); } }, showAllButtons: function () { diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index 2f5a1153..43bd99fc 100644 --- a/js/libs/fluidbook/fluidbook.resize.js +++ b/js/libs/fluidbook/fluidbook.resize.js @@ -117,13 +117,13 @@ FluidbookResize.prototype = { var fw = this.bookScale * fww; var fh = this.bookScale * fhh; - $("#fluidbook").transform({ + $("#fluidbook,#shadow").transform({ scale: [this.bookScale, this.bookScale], origin: ['50%', '50%'] }); var top = marginTop + (ah - fhh) / 2; var left = marginLeft + (aw - fww) / 2; - $("#fluidbook").css({ + $("#fluidbook,#shadow").css({ top: top, left: left, width: fww, @@ -199,7 +199,7 @@ FluidbookResize.prototype = { } this.resizeSplash(); - + if (this.fluidbook.form) { this.fluidbook.form.resize(); } diff --git a/js/libs/fluidbook/fluidbook.zoom.js b/js/libs/fluidbook/fluidbook.zoom.js index 3e59c94c..f67d02a7 100644 --- a/js/libs/fluidbook/fluidbook.zoom.js +++ b/js/libs/fluidbook/fluidbook.zoom.js @@ -180,7 +180,7 @@ FluidbookZoom.prototype = { $this.triggerEvent(((this.zoom == 1) ? 'out' : 'in') + '.end'); } - if (this.desktopScale > 1) { + if (this.zoom > 1) { $("body").addClass('zoomed'); } else { $("body").removeClass('zoomed'); diff --git a/style/fluidbook.less b/style/fluidbook.less index f448c2ee..be6ca32c 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -179,12 +179,16 @@ body, html { /* Desktop devices */ -.desktop #links { - cursor: zoom-in; -} +.desktop { + #links { + cursor: zoom-in; -.desktop.zoomed #links { - cursor: zoom-out; + } + .zoomed { + #links { + cursor: zoom-out; + } + } } #links .link { @@ -338,41 +342,18 @@ body, html { } } -// Fix for #1489 - -.chrome.desktop { - - .doublePage { - overflow: visible; - } - - #pages { - -moz-perspective: 5000px; - -webkit-perspective: 5000px; - -o-perspective: 5000px; - -ms-perspective: 5000px; - perspective: 5000px; - } - - .page { - //-webkit-transform: translateZ(0); - //-o-transform: translateZ(0); - //-ms-transform: translateZ(0); - //transform: translateZ(0); - //-moz-transform: translateZ(0); - } -} - /* Shadow */ -@shadow-height: 180px; -@shadow-offset: 40px; +@shadow-height: 160px; +@shadow-offset: 0px; #shadow { position: absolute; top: 0px; left: 0px; width: unit(@book-page-width*2, px); height: unit(@book-page-height, px); + pointer-events: none; + mix-blend-mode: multiply; /* !!!!!!!!!!! non !!!!!!!!!!!!!!!!! -webkit-transform: translateZ(0); -moz-transform: translateZ(0); @@ -398,12 +379,19 @@ body, html { } } } +} - > .edge { +#edges { + position: absolute; + top: 0px; + left: 0px; + width: unit(@book-page-width*2, px); + height: unit(@book-page-height, px); + pointer-events: none; + > .edge { position: absolute; top: 0; - &.right { @right-edge-width: 48px; @right-edge-bottom-offset: 45px; @@ -2153,3 +2141,4 @@ body > input { font-weight: 600; font-style: normal; } +