wait #3692 @2.5

diff --git a/js/libs/fluidbook/fluidbook.help.js b/js/libs/fluidbook/fluidbook.help.js
index 0ad58b6bfc62084181fed389c25b2a55b1260baa..330896599963b3dc15119ab9a8abcffdb5b399e8 100644 (file)
--- a/js/libs/fluidbook/fluidbook.help.js
+++ b/js/libs/fluidbook/fluidbook.help.js
@@ -411,7 +411,7 @@ FluidbookHelp.prototype = {
     bookmarkLabel: function () {
 
         if (!this.fluidbook.bookmarks.enabled) {
-            return;
+            return '';
         }
         // The bookmark help element is a bit complex because it must be placed in a section of the help overlay that is
         // not already used by the icon labels. Since the menu can be either on the left or right, this needs to be taken
@@ -451,8 +451,10 @@ FluidbookHelp.prototype = {
         html += $('<div class="bookmark-help-label">' + this.fluidbook.l10n.__('add / remove bookmark') + '</div>')[0].outerHTML;
         var wrapper = $('<div class="bookmark-help">' + html + '</div>')[0].outerHTML
 
+        if(wrapper===undefined || wrapper==='undefined'){
+            return '';
+        }
         return wrapper;
     }
 }
-;
 

diff --git a/style/fluidbook.less b/style/fluidbook.less
index e17748e8abfd3f01cef4491cea6add7d3d40b2ec..9bfcc9f6cb1f50a652d728f3c2377c3b9526feef 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -1806,7 +1806,7 @@ form input[type="text"], form input[type="email"] {
     padding: 10px 10px 25px 10px;
     margin: 0 5px 15px;
     position: relative;
-    width: 200px;
+    width: unit(@thumb-width*2, px);
     cursor: pointer;
     text-align: center;
     box-sizing: content-box;
@@ -1814,7 +1814,7 @@ form input[type="text"], form input[type="email"] {
     vertical-align: top;
 
     &.singlemode {
-      width: 100px;
+      width: @thumb-width;
     }
   }
 
@@ -1825,7 +1825,7 @@ form input[type="text"], form input[type="email"] {
     padding: 20px @padding 0;
 
     .doubleThumb {
-      width: 100px;
+      width: @thumb-width;
 
       .rtl & {
         position: relative;
@@ -1851,7 +1851,7 @@ form input[type="text"], form input[type="email"] {
   &.simple {
 
     .overlay {
-      width: 100px;
+      width: @thumb-width;
     }
 
     &.left {
@@ -1911,7 +1911,6 @@ form input[type="text"], form input[type="email"] {
 }
 
 .thumb {
-  @thumb-width: 100px;
   position: absolute;
   width: @thumb-width;
   height: @thumb-height;
@@ -1985,15 +1984,15 @@ form input[type="text"], form input[type="email"] {
   }
 
   &.simple {
-    width: 100px;
+    width: @thumb-width;
 
     &.right {
-      margin-left: 100px;
+      margin-left: @thumb-width;
     }
   }
 
   &.left {
-    margin-right: 100px;
+    margin-right: @thumb-width;
   }
 
   @extrashadowheight: min(22, @thumb-height*0.2);
@@ -2008,7 +2007,7 @@ form input[type="text"], form input[type="email"] {
     opacity: 0.65;
     top: -5px;
     left: -5px;
-    width: 111px;
+    width: unit(@thumb-width+11, px);
     height: @shade-height;
     z-index: 0;
   }

diff --git a/style/mobilefirst.less b/style/mobilefirst.less
index 9957ccf4cc1bad0460a5ec5199cb12c3cd681996..d7b7fdb5406f28d19c186e134ad60f796efda132 100644 (file)
--- a/style/mobilefirst.less
+++ b/style/mobilefirst.less
@@ -162,7 +162,7 @@
 
     .doubleThumb {
       &.simple {
-        width: 100px;
+        width: @thumb-width;
       }
     }
 

diff --git a/style/print.less b/style/print.less
index 652b1a2fe55547f04d31c3bdaf63a078e1260644..e4c141f81b2fca5c8b770908020e684c91b4d080 100644 (file)
--- a/style/print.less
+++ b/style/print.less
@@ -39,12 +39,12 @@
   }
 
   .thumb.right {
-    left: 100px; // Override default so there's no gap between pages
+    left: @thumb-width; // Override default so there's no gap between pages
   }
 
   // Blank pages
   .thumb.blank {
-    width: 100px;
+    width: @thumb-width;
     height: @thumb-height;
 
     // We need to mask the shadow so the :after layer can sit on top with
@@ -74,7 +74,7 @@
   .bookmark-thumbnails {
     .thumb {
       &:before {
-        width: 113px; // Controls drop shadow on right side of thumbnail
+        width: unit(@thumb-width+13, px); // Controls drop shadow on right side of thumbnail
       }
 
       &:nth-child(1) {
@@ -87,22 +87,22 @@
       }
 
       &:nth-child(2) {
-        left: 50px;
+        left: unit(@thumb-width/2, px);
         z-index: 2;
 
         .rtl & {
-          right: 50px;
+          right: unit(@thumb-width/2, px);
           left: auto;
 
         }
       }
 
       &:nth-child(3) {
-        left: 100px;
+        left: @thumb-width;
         z-index: 1;
 
         .rtl & {
-          right: 100px;
+          right: @thumb-width;
           left: auto;
           z-index: 3;
         }
@@ -211,7 +211,7 @@
 
       &[for="allPages"] {
         .doubleThumb {
-          left: 100px;
+          left: @thumb-width;
         }
       }
     }

diff --git a/style/slider.less b/style/slider.less
index f3569c8980b11e87db4a0eeb0a9829a1d05398cb..a7ebd88aa830cd611eab8e0cc5040674f74fdd12 100644 (file)
--- a/style/slider.less
+++ b/style/slider.less
@@ -75,14 +75,14 @@
     background-color: @slider-thumb-background;
     padding: 25px;
     display: none;
-    width: 250px;
+    width: unit(@thumb-width*2+50, px);
     height: @sliderthumb-height;
 
     &.single {
-      width: 150px;
+      width: unit(@thumb-width+50, px);
 
       &:after {
-        left: 59px;
+        left: unit(@thumb-width/2+9, px);
       }
 
       .doubleThumb .thumb.right {
@@ -96,7 +96,7 @@
       content: "";
       position: absolute;
       bottom: -16px;
-      left: 109px;
+      left: unit(@thumb-width+9, px);
       width: 0;
       height: 0;
       border-left: 16px solid transparent;
@@ -110,7 +110,7 @@
 
       > .thumb {
         &.right {
-          left: 100px;
+          left: @thumb-width;
         }
 
         a.bookmark {