wait #7721 @1.5

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 5e40374698ef4f26a40828de99a73269761614be..98cde3f367179e2be71fe1c6aca875ae8d0c2adb 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -795,7 +795,11 @@ FluidbookLinks.prototype = {
         if (this.fluidbook.settings.bookmark) {
             let b = this.fluidbook.bookmarks.getBookmarkForPage(page, this.fluidbook.displayOnePage, this.fluidbook.settings.bookmarkPermanentIcon, true);
             if (this.fluidbook.settings.bookmarkPosition === 'page') {
-                container.append(b);
+                let c = container;
+                if ($(container).find('.linksHolder').length > 0) {
+                    c = $(container).find('.linksHolder');
+                }
+                c.append(b);
             } else {
                 $('#background .links').append(b);
             }

diff --git a/style/bookmarks.less b/style/bookmarks.less
index 6a18729f1941af14cd54fd1261cecb41f62b20ec..c8fce11d090838bbfb55efa747cc9dbd80e6723c 100644 (file)
--- a/style/bookmarks.less
+++ b/style/bookmarks.less
@@ -6,7 +6,7 @@ a.bookmark {
 
 /* Bookmarks */
 .bookmark {
-  #links & {
+  .links & {
     z-index: 4999;
     width: @bookmark-corner-size;
     height: @bookmark-corner-size;

diff --git a/style/elasticslide.less b/style/elasticslide.less
index da9e1883497f66fb7714a53aae991fd5c4dae5f0..eb6efb83df55362412826946aa31f5f9713262c4 100644 (file)
--- a/style/elasticslide.less
+++ b/style/elasticslide.less
@@ -3,6 +3,10 @@
     display: none;
   }
 
+  header {
+    height: 0 !important;
+  }
+
   #center-shadow {
     display: none;
   }
@@ -75,7 +79,7 @@
       overflow-y: hidden;
     }
 
-    .searchResultsNavActive &{
+    .searchResultsNavActive & {
       overflow-y: hidden;
     }
 
@@ -83,6 +87,11 @@
       display: none;
     }
 
+    .links .bookmark {
+      right: auto;
+      left: unit(@book-page-width - @bookmark-corner-size, px);
+    }
+
     .epage_holder {
       scroll-snap-align: start;
       scroll-snap-stop: always;