Merge branch 'sit-Carl' into sit-Leung

This commit is contained in:
Vion
2022-01-20 22:21:41 +08:00
5 changed files with 636 additions and 489 deletions

View File

@@ -144,10 +144,6 @@
}
}
}
/deep/.el-dialog {
width: 80%;
position: relative;
}
.rc-discount {
position: relative;
width: 100%;
@@ -169,8 +165,7 @@
align-items: center;
justify-content: center;
color: #e1001a;
padding-right: 21px;
width: 30%;
width: 34%;
float: left;
height: 100%;
i {
@@ -190,7 +185,7 @@
.rc-right {
display: flex;
flex-direction: column;
margin-left: 36px;
padding-left: 20px;
justify-content: center;
height: 100%;
i {
@@ -204,7 +199,7 @@
}
span {
display: block;
margin-top: 8px;
margin-top: 2px;
}
em {
font-style: normal;
@@ -405,11 +400,6 @@
}
}
}
/deep/.el-dialog {
width: 440px;
height: 432px;
position: relative;
}
.rc-discount {
position: relative;
img {
@@ -430,8 +420,7 @@
align-items: center;
justify-content: center;
color: #e1001a;
padding-right: 21px;
width: 30%;
width: 34%;
float: left;
height: 100%;
i {
@@ -451,7 +440,7 @@
.rc-right {
display: flex;
flex-direction: column;
margin-left: 36px;
padding-left: 20px;
justify-content: center;
height: 100%;
i {
@@ -465,7 +454,7 @@
}
span {
display: block;
margin-top: 8px;
margin-top: 2px;
}
em {
font-style: normal;
@@ -586,4 +575,17 @@
}
}
}
.rc-carousel__gallery-thumbnail{
display: inline;
.rc-img--square{
border: 1px solid #ddd;
border-radius: 3px;
}
&.rc-carousel__gallery-thumbnail--active{
.rc-img--square{
border: 1px solid #E2001A;
}
}
}