Merge remote-tracking branch 'origin/master' into bookedges

# Conflicts:
#	style/fluidbook.less

diff --cc style/fluidbook.less
index eb262beb0b1f97a1f7ed703198847224311131c3,61d94a1712f3d84a119adb103d662d811f68d8ff..517c308b8d53055b3b209d5351b862cf8d4934ba
--- 1/style/fluidbook.less
--- 2/style/fluidbook.less
+++ b/style/fluidbook.less
@@@ -352,60 -332,15 +341,12 @@@ body, html 
        position: absolute;
        top: 0px;
        left: 0px;
 -      /* !!!!!!!!!!! non !!!!!!!!!!!!!!!!!
 -      -webkit-transform: translateZ(0);
 -       -moz-transform: translateZ(0);
 -       -ms-transform: translateZ(0);
 -       -o-transform: translateZ(0);
 -       transform: translateZ(0);*/
 -}
 +      width: unit(@shadow-width-left+@shadow-width-right, px);
 +      height: unit(@book-page-height, px);
 +      pointer-events: none;
 +      mix-blend-mode: multiply;
  
-       > .shadow {
-               position: absolute;
-               left: 0;
-               opacity: @shadow-opacity;
- 
-               &.bottom {
-                       bottom: -@shadow-height+@shadow-offset;
-                       background-size: 100% @shadow-height;
-                       height: @shadow-height;
- 
-                       &.left {
-                               left: -12px;
-                               width: @shadow-width-left;
-                               background-image: url("../images/shadows/back/bottom-left.png");
-                       }
- 
-                       &.right {
-                               display: none;
-                               background-image: url("../images/shadows/back/bottom-right.png");
-                               width: @shadow-width-right;
- 
-                               .landscape & {
-                                       left: @book-page-width;
-                               }
-                       }
-               }
- 
-               &.side {
- 
-                       top: 0;
-                       width: 35px;
-                       height: unit(@book-page-height, px);
-                       background-size: 100% 100%;
- 
-                       &.right {
-                               left: unit(@book-page-width*2, px);
-                               background-image: url("../images/shadows/back/right.png");
-                       }
- 
-                       &.left {
-                               background-image: url("../images/shadows/back/left.png");
-                               left: -35px;
-                       }
- 
-               }
-       }
- }
- 
- #edges {
+ #shadow > div {
        position: absolute;
        top: 0px;
        left: 0px;