fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 301e5cb104c38391b3d247e8066a9bfd2414c414 2 parents 7d03d6df 4a3daf6e

Merge branch 'hotfix/payCss' into feature/meal

Inline Side-by-side
Showing 5 changed files with 55 additions and 60 deletions
.shopping-cashondelivery-page {
width: 860px;
margin: 0 auto;
font-family: arial,"Microsoft YaHei";
font-family: arial, "Microsoft YaHei";
font-size: 12px;
text-align: left;
line-height: 150%;
... ... @@ -16,7 +16,7 @@
color: #333;
text-align: center;
font-size: 20px;
font-family: Arial,helvetica,sans-serif;
font-family: Arial, helvetica, sans-serif;
}
}
... ... @@ -31,7 +31,7 @@
.list-box {
border: 1px #dadada solid;
border-top: 10px #000 solid;
border-bottom: 0px;
border-bottom: 0;
margin-bottom: 20px;
font-size: 14px;
}
... ... @@ -62,7 +62,7 @@
font-weight: bold;
float: left;
a{
a {
text-decoration: none;
color: #468fa2;
outline: none;
... ... @@ -83,7 +83,7 @@
float: left;
}
.li-4{
.li-4 {
width: 170px;
height: 36px;
border-right: 1px #dadada solid;
... ... @@ -126,7 +126,7 @@
padding: 20px;
line-height: 1.8;
margin-bottom: 20px;
font-family: Arial,helvetica,sans-serif;
font-family: Arial, helvetica, sans-serif;
a {
text-decoration: none;
... ... @@ -135,11 +135,11 @@
}
b {
color:#c00;
color: #c00;
}
}
.pay-mode{
.pay-mode {
color: #666;
}
... ... @@ -174,5 +174,4 @@
width: 97px;
}
}
}
... ...
... ... @@ -23,7 +23,7 @@
width: 32px;
height: 32px;
margin-right: 20px;
background: resolve('pay/pay-sure-icon.png');
background: resolve(pay/pay-sure-icon.png);
vertical-align: text-bottom;
}
}
... ... @@ -44,11 +44,11 @@
}
.back-yoho-coin:after {
content: '';
content: "";
display: inline-block;
width: 14px;
height: 14px;
background: resolve('cart/yoho-coin.png');
background: resolve(cart/yoho-coin.png);
margin-left: 6px;
vertical-align: bottom;
}
... ... @@ -75,10 +75,10 @@
}
&:after {
content: '';
content: "";
width: 450px;
height: 170px;
background: resolve('pay/qr-img.png');
background: resolve(pay/qr-img.png);
position: absolute;
top: 30px;
right: 0;
... ... @@ -120,13 +120,13 @@
display: none;
&:after {
content: '';
content: "";
width: 13px;
height: 13px;
margin-left: 8px;
display: inline-block;
vertical-align: middle;
background: resolve('pay/change-icon.png');
background: resolve(pay/change-icon.png);
}
}
}
... ...
.shopping-pay-page {
margin: 25px auto;
.pay-page {
... ... @@ -24,7 +23,7 @@
background: resolve("pay/success.png") no-repeat center left;
}
a{
a {
margin-top: 40px;
margin-left: 140px;
float: left;
... ... @@ -36,9 +35,9 @@
width: 980px;
height: 52px;
overflow: hidden;
padding: 20px 0px 0px 0px;
margin: 0px auto;
border-bottom: 2px solid #000000;
padding: 20px 0 0;
margin: 0 auto;
border-bottom: 2px solid #000;
ul {
width: 446px;
... ... @@ -60,11 +59,10 @@
span {
display: block;
height: 15px;
padding: 15px 0px 0px 0px;
padding: 15px 0 0;
line-height: 15px;
font-size: 12px;
}
}
.end {
... ... @@ -85,6 +83,7 @@
background-image: resolve("pay/pay-title.png");
float: left;
}
.step5 {
height: 31px;
width: 117px;
... ... @@ -92,6 +91,7 @@
background-image: resolve("pay/bc.png");
float: left;
}
.cart-pay {
width: 980px;
margin: 25px auto;
... ... @@ -99,13 +99,13 @@
h2 {
width: 950px;
height: 40px;
height: 40px;
padding: 0px 0px 0px 30px;
padding: 0 0 0 30px;
line-height: 40px;
color: #000;
font-size: 20px;
font-family: Arial,helvetica,sans-serif;
background: resolve("pay/cat-pay.png") no-repeat 0px 11px;
font-family: Arial, helvetica, sans-serif;
background: resolve("pay/cat-pay.png") no-repeat;
background-position: 0 11px;
font-weight: normal;
}
... ... @@ -117,8 +117,8 @@
font-size: 12px;
margin: 0;
strong {
color: #E8044F;
strong {
color: #e8044f;
font-size: 14px;
font-weight: bold;
}
... ... @@ -145,10 +145,10 @@
.pay-way {
width: 980px;
height: 32px;
margin-bottom: 27px;
overflow: hidden;
margin: 30 auto;
margin: 30px auto;
}
.word {
display: block;
float: left;
... ... @@ -156,6 +156,7 @@
font-size: 16px;
margin-right: 10px;
}
.pay-type-img {
height: 30px;
float: left;
... ... @@ -174,7 +175,7 @@
.tabs {
height: 40px;
padding-left: 20px;
background: #ffffff;
background: #fff;
border-bottom: 1px solid #d9d9d9;
li {
... ... @@ -192,10 +193,9 @@
cursor: pointer;
&.active {
background: #ffffff;
border-bottom: 1px solid #ffffff;
background: #fff;
border: 1px solid #d9d9d9;
border-bottom:none;
border-bottom: none;
}
a {
... ... @@ -214,7 +214,7 @@
overflow: hidden;
}
.none{
.none {
display: none;
}
... ... @@ -231,7 +231,7 @@
line-height: 44px;
cursor: pointer;
img{
img {
vertical-align: middle;
outline: none;
}
... ... @@ -274,7 +274,7 @@
font-size: 16px;
border: none;
font-weight: bold;
font-family: arial,"Microsoft YaHei" ! important;
font-family: arial, "Microsoft YaHei" !important;
cursor: pointer;
}
... ... @@ -293,8 +293,8 @@
width: 100%;
height: 1000px;
background: #000;
filter: Alpha(Opacity=50);
opacity: 0.50;
filter: alpha(Opacity=50);
opacity: 0.5;
overflow: hidden;
position: absolute;
top: 0;
... ... @@ -305,7 +305,7 @@
margin-left: -203px;
margin-top: -124px;
padding: 50px 40px;
background-color: #FFFFFF;
background-color: #fff;
position: absolute;
top: 50%;
left: 50%;
... ... @@ -323,14 +323,15 @@
width: 134px;
height: 38px;
line-height: 38px;
color: #FFFFFF;
color: #fff;
font-size: 14px;
margin: 0 14px;
display: inline-block;
text-align: center;
text-decoration: none;
}
.change {
}
.change {
background: #bdbdbd;
}
... ...
... ... @@ -2,14 +2,14 @@
width: 990px;
margin: 0 auto;
font-size: 12px;
font-family: Arial,helvetica,sans-serif;
font-family: Arial, helvetica, sans-serif;
.pay-title {
height: 65px;
overflow: hidden;
padding: 20px 0px 0px 0px;
margin: 0px auto;
border-bottom: 2px solid #000000;
padding: 20px 0 0;
margin: 0 auto;
border-bottom: 2px solid #000;
ul {
width: 446px;
... ... @@ -31,10 +31,9 @@
span {
display: block;
height: 15px;
padding: 15px 0px 0px 0px;
padding: 15px 0 0;
line-height: 15px;
}
}
.end {
... ...
... ... @@ -2,14 +2,14 @@
width: 990px;
margin: 0 auto;
font-size: 12px;
font-family:arial, "Microsoft YaHei";
font-family: arial, "Microsoft YaHei";
.pay-title {
height: 52px;
overflow: hidden;
padding: 20px 0px 0px 0px;
margin: 0px auto;
border-bottom: 2px solid #000000;
padding: 20px 0 0;
margin: 0 auto;
border-bottom: 2px solid #000;
ul {
width: 446px;
... ... @@ -31,10 +31,9 @@
span {
display: block;
height: 15px;
padding: 15px 0px 0px 0px;
padding: 15px 0 0;
line-height: 15px;
}
}
.end {
... ... @@ -83,7 +82,6 @@
color: red;
}
}
}
.w-right {
... ... @@ -127,7 +125,7 @@
}
}
.up {
.up {
float: right;
border-width: 4px 3px 0;
border-style: solid dashed dashed;
... ... @@ -141,8 +139,6 @@
border-color: transparent transparent #2ea7e7;
}
.w-addrinfo {
padding: 12px 0;
color: #9b9b9b;
... ...