diff --git a/sass/css/_shop.scss b/sass/css/_shop.scss index d6a9736b..56004901 100644 --- a/sass/css/_shop.scss +++ b/sass/css/_shop.scss @@ -371,7 +371,9 @@ button { overflow-y: hidden; -webkit-overflow-scrolling: touch; -ms-overflow-style: -ms-autohiding-scrollbar; - min-height: 345px; + /* img.height + .items-cart-list.padding + .items-cart-list.div.padding + h6.font-size*_base.h6.line-height + progress-container.warning.height + + + bootstrap.h6.margin-bottom + progress-container.height */ + min-height: calc(350px + 17px + 10px + 0.6rem*1.1 + 24px + 0.5rem + 22px); background-color: #ebebeb; padding: 5px 5px 12px; position: relative; @@ -424,6 +426,11 @@ button { width: 100%; text-align: center; position: relative; + height: 22px; + + &.warning { + height: 24px; + } > .alert-warning { background-color: inherit; diff --git a/static/js/shop.jsx b/static/js/shop.jsx index 818987a9..12b8b9ec 100644 --- a/static/js/shop.jsx +++ b/static/js/shop.jsx @@ -685,7 +685,6 @@ class ProductCartItem extends React.PureComponent { {/* warning container */}
@@ -706,7 +705,6 @@ class ProductCartItem extends React.PureComponent {
{model.name_number}
@@ -728,7 +726,6 @@ class ProductCartItem extends React.PureComponent { {/* progression container */}
diff --git a/static/js/shop.min.js b/static/js/shop.min.js index 118f21d5..181e9544 100644 --- a/static/js/shop.min.js +++ b/static/js/shop.min.js @@ -634,9 +634,6 @@ var ProductCartItem = /*#__PURE__*/function (_React$PureComponent3) { onMouseEnter: _this4.handleOnMouseEnterRemoveItem.bind(_this4, index), onMouseLeave: _this4.handleOnMouseLeaveRemoveItem.bind(_this4, index) }), /*#__PURE__*/React.createElement("div", { - style: { - 'height': '24px' - }, className: "progress-container warning", onMouseEnter: _this4.handleOnMouseEnterWarningItem.bind(_this4, index, warning), onMouseLeave: _this4.handleOnMouseLeaveWarningItem.bind(_this4, index, warning) @@ -648,9 +645,6 @@ var ProductCartItem = /*#__PURE__*/function (_React$PureComponent3) { }, /*#__PURE__*/React.createElement("p", { className: "rule warning" }, /*#__PURE__*/React.createElement("i", null, warning.message)))), /*#__PURE__*/React.createElement("h6", null, model.name_number), /*#__PURE__*/React.createElement("div", { - style: { - 'height': '350px' - }, onMouseEnter: _this4.handleOnMouseEnterRemoveItem.bind(_this4, index) }, /*#__PURE__*/React.createElement("img", { className: "item-cart", @@ -665,9 +659,6 @@ var ProductCartItem = /*#__PURE__*/function (_React$PureComponent3) { src: "/images/shop/icon-remove.svg", alt: "rm" }), /*#__PURE__*/React.createElement("p", null, "Remove")), /*#__PURE__*/React.createElement("div", { - style: { - 'height': '22px' - }, className: "progress-container", onMouseEnter: _this4.handleOnMouseEnterItem.bind(_this4, index), onMouseLeave: _this4.handleOnMouseLeaveItem.bind(_this4, index)