diff --git a/sass/css/_shop.scss b/sass/css/_shop.scss index d6a9736..5600490 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 818987a..12b8b9e 100644 --- a/static/js/shop.jsx +++ b/static/js/shop.jsx @@ -685,7 +685,6 @@ class ProductCartItem extends React.PureComponent { {/* warning container */}