From: Vincent Vanwaelscappel Date: Sun, 21 Feb 2021 20:11:08 +0000 (+0100) Subject: wait #4285 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=44c9080fdb989d2786163a03ece19b34f9515004;p=fluidbook-html5.git wait #4285 @1 --- diff --git a/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js b/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js index e4530941..2ed2ddb2 100644 --- a/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js +++ b/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js @@ -31,6 +31,10 @@ FluidbookCartGrandVision.prototype = { }); }, + getTooltipStyle:function(){ + return 'invert'; + }, + openMenu: function (p1, p2, cb) { if (p1 === 'details') { return this.openDetails(p2, cb); @@ -71,6 +75,8 @@ FluidbookCartGrandVision.prototype = { } else { $("#emptyres").show(); } + + $("#grandvision-selection .items").perfectScrollbar(); }, openSelection: function (cb) { @@ -78,7 +84,7 @@ FluidbookCartGrandVision.prototype = { var res = '
'; res += this.fluidbook.menu.getCaption('', true); - res += '
'; + res += '
'; res += this.cartSelection(); res += this.cartBoxes(); res += '
'; @@ -101,6 +107,8 @@ FluidbookCartGrandVision.prototype = { }); }); + $("#grandvision-selection .items").perfectScrollbar(); + if (cb !== undefined) { cb(); diff --git a/js/libs/fluidbook/fluidbook.cart.js b/js/libs/fluidbook/fluidbook.cart.js index 1435c1ff..16575d06 100644 --- a/js/libs/fluidbook/fluidbook.cart.js +++ b/js/libs/fluidbook/fluidbook.cart.js @@ -45,7 +45,7 @@ FluidbookCart.prototype = { $this.fluidbook.tooltip.displayTooltip(tooltip, tooltipStyle); setTimeout(function(){ $this.fluidbook.tooltip.hideTooltip(); - },5000) + },2500) return false; }); diff --git a/style/cart/grandvision.less b/style/cart/grandvision.less index 36e2089f..b9d50351 100644 --- a/style/cart/grandvision.less +++ b/style/cart/grandvision.less @@ -1,10 +1,10 @@ #grandvision-cart { @bleu: #2459a9; background-color: #f3f3f3; - color: #000; padding: 0 40px 40px 40px; .content { + color: #000; text-align: left; overflow: visible !important; @@ -16,7 +16,7 @@ #grandvision-selection { display: inline-block; - width: 550px; + width: 520px; vertical-align: top; margin-top: -20px; height: 700px; @@ -137,7 +137,9 @@ } .items { - width: 550px; + width: 520px; + max-height: 580px; + position: relative; .item { width: 515px; @@ -180,6 +182,7 @@ height: 700px; vertical-align: top; margin-top: -20px; + margin-left: 40px; } } }