M-Labs
/
web2019
5
0
Fork 2
Code Issues 20 Pull Requests 3 Releases Wiki Activity

Fix incorrect min-height for the crate #75

Merged
sb10q merged 1 commits from esavkin/web2019:74-crate-height-fix into master 2023-07-07 16:35:40 +08:00
Conversation 0 Commits 1 Files Changed 3 +8 -13
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sass/css/_shop.scss
View File

@ -371,7 +371,9 @@ button {
overflow-y: hidden; overflow-y: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
-ms-overflow-style: -ms-autohiding-scrollbar; -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; background-color: #ebebeb;
padding: 5px 5px 12px; padding: 5px 5px 12px;
position: relative; position: relative;
@ -424,6 +426,11 @@ button {
width: 100%; width: 100%;
text-align: center; text-align: center;
position: relative; position: relative;
height: 22px;
&.warning {
height: 24px;
}
> .alert-warning { > .alert-warning {
background-color: inherit; background-color: inherit;

3
static/js/shop.jsx
View File

@ -685,7 +685,6 @@ class ProductCartItem extends React.PureComponent {
{/* warning container */} {/* warning container */}
<div <div
style={{'height': '24px'}}
className="progress-container warning" className="progress-container warning"
onMouseEnter={this.handleOnMouseEnterWarningItem.bind(this, index, warning)} onMouseEnter={this.handleOnMouseEnterWarningItem.bind(this, index, warning)}
onMouseLeave={this.handleOnMouseLeaveWarningItem.bind(this, index, warning)}> onMouseLeave={this.handleOnMouseLeaveWarningItem.bind(this, index, warning)}>
@ -706,7 +705,6 @@ class ProductCartItem extends React.PureComponent {
<h6>{model.name_number}</h6> <h6>{model.name_number}</h6>
<div <div
style={{'height': '350px'}}
onMouseEnter={this.handleOnMouseEnterRemoveItem.bind(this, index)} onMouseEnter={this.handleOnMouseEnterRemoveItem.bind(this, index)}
> >
@ -728,7 +726,6 @@ class ProductCartItem extends React.PureComponent {
{/* progression container */} {/* progression container */}
<div <div
style={{'height': '22px'}}
className="progress-container" className="progress-container"
onMouseEnter={this.handleOnMouseEnterItem.bind(this, index)} onMouseEnter={this.handleOnMouseEnterItem.bind(this, index)}
onMouseLeave={this.handleOnMouseLeaveItem.bind(this, index)}> onMouseLeave={this.handleOnMouseLeaveItem.bind(this, index)}>

9
static/js/shop.min.js vendored
View File

@ -634,9 +634,6 @@ var ProductCartItem = /*#__PURE__*/function (_React$PureComponent3) {
onMouseEnter: _this4.handleOnMouseEnterRemoveItem.bind(_this4, index), onMouseEnter: _this4.handleOnMouseEnterRemoveItem.bind(_this4, index),
onMouseLeave: _this4.handleOnMouseLeaveRemoveItem.bind(_this4, index) onMouseLeave: _this4.handleOnMouseLeaveRemoveItem.bind(_this4, index)
}), /*#__PURE__*/React.createElement("div", { }), /*#__PURE__*/React.createElement("div", {
style: {
'height': '24px'
},
className: "progress-container warning", className: "progress-container warning",
onMouseEnter: _this4.handleOnMouseEnterWarningItem.bind(_this4, index, warning), onMouseEnter: _this4.handleOnMouseEnterWarningItem.bind(_this4, index, warning),
onMouseLeave: _this4.handleOnMouseLeaveWarningItem.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", { }, /*#__PURE__*/React.createElement("p", {
className: "rule warning" className: "rule warning"
}, /*#__PURE__*/React.createElement("i", null, warning.message)))), /*#__PURE__*/React.createElement("h6", null, model.name_number), /*#__PURE__*/React.createElement("div", { }, /*#__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) onMouseEnter: _this4.handleOnMouseEnterRemoveItem.bind(_this4, index)
}, /*#__PURE__*/React.createElement("img", { }, /*#__PURE__*/React.createElement("img", {
className: "item-cart", className: "item-cart",
@ -665,9 +659,6 @@ var ProductCartItem = /*#__PURE__*/function (_React$PureComponent3) {
src: "/images/shop/icon-remove.svg", src: "/images/shop/icon-remove.svg",
alt: "rm" alt: "rm"
}), /*#__PURE__*/React.createElement("p", null, "Remove")), /*#__PURE__*/React.createElement("div", { }), /*#__PURE__*/React.createElement("p", null, "Remove")), /*#__PURE__*/React.createElement("div", {
style: {
'height': '22px'
},
className: "progress-container", className: "progress-container",
onMouseEnter: _this4.handleOnMouseEnterItem.bind(_this4, index), onMouseEnter: _this4.handleOnMouseEnterItem.bind(_this4, index),
onMouseLeave: _this4.handleOnMouseLeaveItem.bind(_this4, index) onMouseLeave: _this4.handleOnMouseLeaveItem.bind(_this4, index)