fe / yohobuywap-node · Commits

Go to a project

Authored by weiqingting
Commit 9fcd0d1fd2a4828b199875bdf1da93ff971abc75 1 parent 4b4bbb2b

Merge branch 'feature_student' into release/4.9.1.0 

# Conflicts:
#	apps/product/models/detail.js
#	config/common.js
#	public/scss/common/_good.css
Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
... ... @@ -410,9 +410,9 @@
input {
border: 0 none;
padding: 10px 0;
height: 64px;
line-height: 64px;
padding: 12px 0;
height: 60px;
line-height: 60px;
}
.s-red {
... ...
... ... @@ -56,13 +56,13 @@
display: inline-block;
width: 52px;
height: 54px;
background-image: url('/channel/click-txt.png');
background-image: url("/channel/click-txt.png");
}
&.received {
width: 113px;
height: 132px;
background-image: url('/channel/received.png');
height: 134px;
background-image: url("/channel/received.png");
position: absolute;
top: 0;
right: 0;
... ... @@ -70,8 +70,8 @@
&.zero {
width: 111px;
height: 132px;
background-image: url('/channel/zero.png');
height: 134px;
background-image: url("/channel/zero.png");
position: absolute;
top: 0;
right: 0;
... ...