wip #4319 @1

diff --git a/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js b/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
index b47cc048c5070fa0630453146c927f6fe3e701b4..6e846608912e454162abdc801e1efb0df419ae21 100644 (file)
--- a/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
+++ b/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
@@ -264,7 +264,7 @@ FluidbookCartGrandVision.prototype = {
             });
         });
 
-        $("#grandvision-selection .items").perfectScrollbar();
+      //  $("#grandvision-selection .items").perfectScrollbar();
 
         this.setBox();
         this.initSortable();

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 435fe8786ccf6f523d5b52293add807a7480015a..120d095bacb92b03d1e585c403b68c8d642fc4e7 100644 (file)
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -772,19 +772,19 @@ FluidbookMenu.prototype = {
                 break;
             case 'cart-grandvision-selection':
                 h = hh * 0.98
-                var rw = 1100;
-                var rh = 750;
+                var rw = parseInt($("#grandvision-cart").css('width'));
+                var rh = parseInt($("#grandvision-cart").css('height'));
                 if (ww < rw || hh < rh) {
-                    var s = Math.min(ww / rw, hh / rh);
+                    var s = Math.min(ww / rw, h / rh);
                 } else {
                     s = 1;
                 }
                 h = rh * s;
                 w = rw * s;
                 $("#grandvision-cart").css('transform', 'scale(' + s + ')');
-                setTimeout(function () {
-                    $("#grandvision-selection .items").perfectScrollbar('update');
-                }, 200);
+                // setTimeout(function () {
+                //     $("#grandvision-selection .items").perfectScrollbar('update');
+                // }, 200);
                 break;
             case 'bookmarks':
                 if (this.fluidbook.mobilefirst.enabled) {

diff --git a/style/cart/grandvision.less b/style/cart/grandvision.less
index e710cb9b2dd122f8a342df1aadf4228e9aaacf4c..120e596d2ae4207154d4dd99c11c3297cc035fc0 100644 (file)
--- a/style/cart/grandvision.less
+++ b/style/cart/grandvision.less
@@ -53,10 +53,11 @@
 }
 
 #grandvision-cart {
+  @h: 1010px;
   @bleu: #2459a9;
   background-color: #f3f3f3;
   padding: 0 40px 40px 40px;
-  height: 750px;
+  height: @h;
   width: 1100px;
   transform-origin: 0 0;
 
@@ -113,7 +114,7 @@
       width: 520px;
       vertical-align: top;
       margin-top: -30px;
-      height: 700px;
+      height: unit(@h - 50, px);
 
       #emptyres {
         display: none;
@@ -232,7 +233,7 @@
 
       .items {
         width: 520px;
-        max-height: 580px;
+        max-height: unit(@h - 170, px);
         position: relative;
 
         .item {
@@ -281,7 +282,7 @@
     #grandvision-boxes {
       display: inline-block;
       width: 450px;
-      height: 700px;
+      height: unit(@h - 50, px);
       vertical-align: top;
       margin-top: -30px;
       margin-left: 40px;
@@ -322,15 +323,15 @@
         padding: 20px 8px 20px 20px;
         box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);
         width: 452px;
-        height: 600px;
+        height: unit(@h - 150, px);
         margin-top: 17px;
 
         h3 {
-          margin-bottom: 0px;
+          margin-bottom: 15px;
         }
 
         .slots {
-          max-height: 500px;
+          max-height: unit(@h - 250, px);
           overflow: hidden;
 
           .slot, .item, .text {