Authored by 周少峰

Merge branch 'release/5.4.1' into gray

... ... @@ -99,7 +99,7 @@
}
li {
width: 50%
width: 50%;
}
}
}
... ... @@ -167,7 +167,9 @@
}
&.on:before {
content: '.';
background-image: url(/cart/radio-on.png);
text-indent: -9999px;
}
}
... ... @@ -369,7 +371,6 @@
display: inline;
}
&.open > .more-addr-btn {
display: none;
}
... ... @@ -632,7 +633,8 @@
font-size: 13px;
color: #444;
th,td {
th,
td {
text-align: center;
}
... ... @@ -729,7 +731,6 @@
}
.invoice-info-view {
display: inline-block;
float: right;
line-height: 70px;
padding-right: 20px;
... ... @@ -750,7 +751,7 @@
.extra-wrap {
font-size: 14px;
padding: 20px 20px;
padding: 20px;
border: 1px solid $borderColor;
border-bottom-color: #fff;
... ... @@ -860,9 +861,9 @@
}
&.using-code .opt-area {
> * {
> * {
display: inline-block;
}
}
.sure-use-ticket {
display: none;
... ... @@ -1036,7 +1037,6 @@
width: 76px;
height: 22px;
line-height: 22px;
display: inline-block;
border: 1px solid #000;
background-color: #fff;
text-align: center;
... ... @@ -1061,7 +1061,7 @@
}
.red-packet-box {
padding: 10px 10px;
padding: 10px;
background-color: #f0f0f0;
line-height: 24px;
... ... @@ -1266,7 +1266,9 @@
}
&.on:before {
content: '.';
background-image: url(/cart/radio-on.png);
text-indent: -9999px;
}
}
... ... @@ -1552,7 +1554,9 @@
}
&.on:before {
content: '.';
background-image: url(/cart/radio-on.png);
text-indent: -9999px;
}
}
... ...