Authored by 毕凯

Merge branch 'release/coupon-summer-2' into develop

{
"extends": "stylelint-config-yoho",
"ignoreFiles": ["public/*/dist/"]
"ignoreFiles": "**/dist/css/*.css"
}
... ...
{
"name": "express-yoho",
"version": "0.0.0",
"version": "1.0.0",
"private": true,
"scripts": {
"start": "node ./bin/www",
"dev": "nodemon -e js,hbs -i public/ ./bin/www",
"online": "NODE_ENV=\"production\" node bin/www",
"lint": "eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",
"precommit": "npm run lint"
"lint-js": "eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",
"lint-css": "stylelint --config .stylelintrc `git diff --cached --name-only --diff-filter=ACM | grep .css$`",
"precommit": "npm run lint-js && npm run lint-css"
},
"dependencies": {
"body-parser": "^1.15.0",
... ...
... ... @@ -10,7 +10,7 @@ body {
font-size: 12px;
font-family: Helvetica, Arial, "黑体";
background: #fff;
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
overflow-x: hidden;
}
... ...
... ... @@ -27,7 +27,7 @@
text-align: center;
&:after {
content: '';
content: "";
display: block;
width: 100%;
height: 10px;
... ... @@ -83,7 +83,7 @@
line-height: 1.25;
&:before {
content: '';
content: "";
display: block;
width: 100%;
height: 40px;
... ...
... ... @@ -8,14 +8,14 @@
html,
body {
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
overflow-x: hidden;
}
body {
font-size: 12px;
font-family: Helvetica, Arial, "黑体";
background: #fff;/*f0eff1*/
background: #fff; /* f0eff1 */
}
input,
... ...
... ... @@ -27,7 +27,7 @@
text-align: center;
&:after {
content: '';
content: "";
display: block;
width: 100%;
height: 10px;
... ... @@ -104,7 +104,7 @@
transform: translate(-50%, -50%);
&:before {
content: '';
content: "";
display: block;
width: 100%;
height: 54px;
... ... @@ -145,7 +145,7 @@
height: 100%;
left: 0;
top: 0;
background: rgba(0,0,0,0.6);
background: rgba(0, 0, 0, .6);
z-index: 2;
}
... ... @@ -155,7 +155,7 @@
height: 100%;
left: 0;
top: 0;
background: rgba(0,0,0,0.6);
background: rgba(0, 0, 0, .6);
z-index: 2;
.pengyouquan {
... ...
... ... @@ -10,7 +10,7 @@ body {
font-size: 12px;
font-family: Helvetica, Arial, "黑体";
background: #fff;
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
overflow-x: hidden;
}
... ...
... ... @@ -27,7 +27,7 @@
text-align: center;
&:after {
content: '';
content: "";
display: block;
width: 100%;
height: 10px;
... ... @@ -83,7 +83,7 @@
line-height: 1.25;
&:before {
content: '';
content: "";
display: block;
width: 100%;
height: 40px;
... ...
... ... @@ -8,14 +8,14 @@
html,
body {
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
overflow-x: hidden;
}
body {
font-size: 12px;
font-family: Helvetica, Arial, "黑体";
background: #fff;/*f0eff1*/
background: #fff; /* f0eff1 */
}
input,
... ...
... ... @@ -16,17 +16,17 @@
}
.share {
margin: 0px auto 30px;
margin: 0 auto 30px;
width: 560px;
height: 80px;
font-size: 29px;
line-height: 80px;
color: #fff;
background: #d25d7f;;
background: #d25d7f;
text-align: center;
&:after {
content: '';
content: "";
display: block;
width: 100%;
height: 10px;
... ... @@ -43,8 +43,8 @@
}
.banner-border {
border-left: 3px solid #444444;
border-right: 3px solid #444444;
border-left: 3px solid #444;
border-right: 3px solid #444;
background-color: #f1f1f9;
padding-top: 30px;
}
... ... @@ -110,7 +110,7 @@
transform: translate(-50%, -50%);
&:before {
content: '';
content: "";
display: block;
width: 100%;
height: 54px;
... ... @@ -151,7 +151,7 @@
height: 100%;
left: 0;
top: 0;
background: rgba(0,0,0,0.6);
background: rgba(0, 0, 0, .6);
z-index: 2;
}
... ... @@ -161,7 +161,7 @@
height: 100%;
left: 0;
top: 0;
background: rgba(0,0,0,0.6);
background: rgba(0, 0, 0, .6);
z-index: 2;
.pengyouquan {
... ...