]> _ Git - fluidbook-html5.git/commitdiff
Merge remote-tracking branch 'origin/burgermenu' into bookedges
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 3 Oct 2017 15:23:26 +0000 (17:23 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 3 Oct 2017 15:23:26 +0000 (17:23 +0200)
1  2 
js/libs/fluidbook/fluidbook.js
style/fluidbook.less

Simple merge
index 721a974a0d4eda453b7fdfb725f7b786a7617ad3,d862069da1cc685535309163f8fc3fc113615e11..383988fe2a442059a6d7fc98167d194fe6d2fda1
@@@ -411,9 -418,10 +420,10 @@@ body, html 
        width: unit(@book-page-width*2, px);
        height: unit(@book-page-height, px);
        pointer-events: none;
+       .hideifnot(@edges-display);
  
        .portrait & {
 -              display: none;
 +              width: unit(@book-page-width, px);
        }
  
        @edge-scale: 1;