wait #6581 @0.5

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 1f73004eefcbc585c8bff0a451cf3885af50aa2c..fb4cc89a1b1367e7db130faea69632945ff74430 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -659,6 +659,8 @@ FluidbookLinks.prototype = {
             }
         }
 
+        $("#background .links .bookmark").remove();
+
         if (leftLinks) {
             this.setLinksInContainer(leftPage, 'left');
         }
@@ -739,7 +741,13 @@ FluidbookLinks.prototype = {
             container.addClass('empty');
         }
         if (this.fluidbook.settings.bookmark) {
-            container.append(this.fluidbook.bookmarks.getBookmarkForPage(page, this.fluidbook.displayOnePage, this.fluidbook.settings.bookmarkPermanentIcon));
+            let b = this.fluidbook.bookmarks.getBookmarkForPage(page, this.fluidbook.displayOnePage, this.fluidbook.settings.bookmarkPermanentIcon);
+            if (this.fluidbook.settings.bookmarkPosition === 'page') {
+                container.append(b);
+            } else {
+                $('#background .links').append(b);
+            }
+
         }
     },
 

diff --git a/style/bookmarks.less b/style/bookmarks.less
index 88fb3b01dfc7ddef4165e2756202f6df580dd7ea..b5805feea1e6a27baf8c44a2f90ce4846bd34de6 100644 (file)
--- a/style/bookmarks.less
+++ b/style/bookmarks.less
@@ -57,6 +57,21 @@ a.bookmark {
     opacity: 1 !important;
     transition: none;
   }
+
+  #background .links & {
+    width: @bookmark-corner-size;
+    height: @bookmark-corner-size;
+    background-size: @bookmark-corner-size @bookmark-corner-size;
+    top: @menu-height;
+
+    &.left {
+      left: @bookmark-corner-offset;
+    }
+
+    &.right {
+      right: @bookmark-corner-offset;
+    }
+  }
 }
 
 .bookmark.left {

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 0553a04774ed88d616ce7d36ff80d0cc4fcda28e..aae19aa72718706d2bbc91df8c4eeed640dba43a 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -937,6 +937,7 @@ body, html {
 header {
   position: relative;
   z-index: 13;
+  height: @menu-height;
 
   // Header should sit above help overlay when it is open
   .help & {