Merge branch 'master' into burgermenu

diff --cc _index.html
index d55d4782cf95facedb117e98a01954af396a53e6,9084017dae9d4d1822c80b694948b0069bc690b7..8f70248e7b10e1854b4d6420f772ac64a242ec1a
--- 1/_index.html
--- 2/_index.html
+++ b/_index.html
@@@ -24,10 -24,17 +24,18 @@@
  <div id="message"><!-- $message --></div>
  <!--googleon: all-->
  <div id="main">
-       <div id="background"></div>
+       <div id="background">
+ 
+               <div id="shadow">
+                       <div class="shadow bottom left"></div>
+                       <div class="shadow bottom right"></div>
+                       <div class="shadow side left"></div>
+                       <div class="shadow side right"></div>
+               </div>
+       </div>
        <header>
 -              <nav id="nav"></nav>
 +              <nav id="horizontalNav"></nav>
 +              <nav id="menu"></nav>
                <div id="search"></div>
                <a id="logo" href="#"></a>
        </header>

diff --cc js/libs/fluidbook/fluidbook.desktop.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.menu.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.nav.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.resize.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.utils.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.zoom.js
index 64833d6432d9d29b529a6c1875afed8501e88487,ec7783e958c6782b7d05ac6496db85835a465dbf..1e7551375e71af800a32bd24a48a13c162a00671
--- 1/js/libs/fluidbook/fluidbook.zoom.js
--- 2/js/libs/fluidbook/fluidbook.zoom.js
+++ b/js/libs/fluidbook/fluidbook.zoom.js
@@@ -160,12 -160,9 +160,12 @@@ FluidbookZoom.prototype = 
              animation.origin = ['50%', '50%'];
          }
  
-         var hiddenElements = $("header,footer,#interface,#links a.bookmark");
+         var hiddenElements = $("header,footer,#interface,#links a.bookmark,#shadow");
  
          if (this.zoom != 1) {
 +
 +            this.fluidbook.help.hide(); // Hide the help view if it's showing
 +
              if (!$('header').hasClass('hidden')) {
                  $(hiddenElements).addClass('hidden');
                  this.hideInterfaceTimeout = setTimeout(function () {

diff --cc js/main.js
Simple merge

diff --cc style/fluidbook.less
index 85718847640839a762d1ae675a4edd1bff6f551b,cdb902df3f150173609e4c5727e5224ebd399ac8..e3d401f59730bd2a70e779f0d0115a1bb11c7ef5
--- 1/style/fluidbook.less
--- 2/style/fluidbook.less
+++ b/style/fluidbook.less
@@@ -344,14 -415,88 +415,88 @@@ body, html 
        position: absolute;
        top: 0px;
        left: 0px;
- }
+       width: unit(@book-page-width*2, px);
+       height: unit(@book-page-height, px);
+       pointer-events: none;
  
- .portrait #shadow > div.right {
-       display: none;
+       .portrait & {
+               display: none;
+       }
+ 
+       @edge-scale: 1;
+ 
+       > .edge {
+               position: absolute;
+               top: 0;
+               height: 100%;
+ 
+               > div {
+                       background-size: 100% 100%;
+                       position: absolute;
+                       background-repeat: no-repeat;
+               }
+ 
+               .top {
+                       top: 0;
+                       height: unit(12*@edge-scale, px);
+               }
+ 
+               .bottom {
+                       bottom: 0;
+                       height: unit(22*@edge-scale, px);
+               }
+ 
+               .middle {
+                       top: unit(12*@edge-scale, px);
+                       bottom: unit(22*@edge-scale, px);
+               }
+ 
+               &.left {
+                       left: unit(-17*@edge-scale, px);
+                       width: unit(17*@edge-scale, px);
+ 
+                       div {
+                               width: unit(17*@edge-scale, px);
+                       }
+ 
+                       .top {
+                               background-image: url("../images/edges/edge-left-top.png");
+                       }
+ 
+                       .bottom {
+                               background-image: url("../images/edges/edge-left-bottom.png");
+                       }
+ 
+                       .middle {
+                               background-image: url("../images/edges/edge-left-middle.png");
+                       }
+               }
+ 
+               &.right {
+                       right: unit(-11*@edge-scale, px);
+                       width: unit(11*@edge-scale, px);
+ 
+                       div {
+                               width: unit(11*@edge-scale, px);
+                       }
+ 
+                       .top {
+                               background-image: url("../images/edges/edge-right-top.png");
+                       }
+ 
+                       .bottom {
+                               background-image: url("../images/edges/edge-right-bottom.png");
+                       }
+ 
+                       .middle {
+                               background-image: url("../images/edges/edge-right-middle.png");
+                       }
+               }
+       }
  }
  
 -/* Nav */
 -#nav #locales {
 +/* Locale Flag icon */
 +.locale-flag {
        display: inline-block;
        width: 22px;
        height: 17px;