fe / yoho-activity-node · Commits

Go to a project

Authored by 毕凯
Commit 3b897bee5356b4b623ef939ea4928f4cf0222a05 2 parents ac7b54b3 1d84ba25

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

Inline Side-by-side
Showing 10 changed files with 27 additions and 26 deletions
1 { 1 {
2 "extends": "stylelint-config-yoho", 2 "extends": "stylelint-config-yoho",
3 - "ignoreFiles": ["public/*/dist/"] 3 + "ignoreFiles": "**/dist/css/*.css"
4 } 4 }
1 { 1 {
2 "name": "express-yoho", 2 "name": "express-yoho",
3 - "version": "0.0.0", 3 + "version": "1.0.0",
4 "private": true, 4 "private": true,
5 "scripts": { 5 "scripts": {
6 "start": "node ./bin/www", 6 "start": "node ./bin/www",
7 "dev": "nodemon -e js,hbs -i public/ ./bin/www", 7 "dev": "nodemon -e js,hbs -i public/ ./bin/www",
8 "online": "NODE_ENV=\"production\" node bin/www", 8 "online": "NODE_ENV=\"production\" node bin/www",
9 - "lint": "eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",  
10 - "precommit": "npm run lint" 9 + "lint-js": "eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",
  10 + "lint-css": "stylelint --config .stylelintrc `git diff --cached --name-only --diff-filter=ACM | grep .css$`",
  11 + "precommit": "npm run lint-js && npm run lint-css"
11 }, 12 },
12 "dependencies": { 13 "dependencies": {
13 "body-parser": "^1.15.0", 14 "body-parser": "^1.15.0",
@@ -10,7 +10,7 @@ body { @@ -10,7 +10,7 @@ body {
10 font-size: 12px; 10 font-size: 12px;
11 font-family: Helvetica, Arial, "黑体"; 11 font-family: Helvetica, Arial, "黑体";
12 background: #fff; 12 background: #fff;
13 - -webkit-tap-highlight-color: rgba(0,0,0,0); 13 + -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
14 overflow-x: hidden; 14 overflow-x: hidden;
15 } 15 }
16 16
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 text-align: center; 27 text-align: center;
28 28
29 &:after { 29 &:after {
30 - content: ''; 30 + content: "";
31 display: block; 31 display: block;
32 width: 100%; 32 width: 100%;
33 height: 10px; 33 height: 10px;
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 line-height: 1.25; 83 line-height: 1.25;
84 84
85 &:before { 85 &:before {
86 - content: ''; 86 + content: "";
87 display: block; 87 display: block;
88 width: 100%; 88 width: 100%;
89 height: 40px; 89 height: 40px;
@@ -8,14 +8,14 @@ @@ -8,14 +8,14 @@
8 8
9 html, 9 html,
10 body { 10 body {
11 - -webkit-tap-highlight-color: rgba(0,0,0,0); 11 + -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
12 overflow-x: hidden; 12 overflow-x: hidden;
13 } 13 }
14 14
15 body { 15 body {
16 font-size: 12px; 16 font-size: 12px;
17 font-family: Helvetica, Arial, "黑体"; 17 font-family: Helvetica, Arial, "黑体";
18 - background: #fff;/*f0eff1*/ 18 + background: #fff; /* f0eff1 */
19 } 19 }
20 20
21 input, 21 input,
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 text-align: center; 27 text-align: center;
28 28
29 &:after { 29 &:after {
30 - content: ''; 30 + content: "";
31 display: block; 31 display: block;
32 width: 100%; 32 width: 100%;
33 height: 10px; 33 height: 10px;
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 transform: translate(-50%, -50%); 104 transform: translate(-50%, -50%);
105 105
106 &:before { 106 &:before {
107 - content: ''; 107 + content: "";
108 display: block; 108 display: block;
109 width: 100%; 109 width: 100%;
110 height: 54px; 110 height: 54px;
@@ -145,7 +145,7 @@ @@ -145,7 +145,7 @@
145 height: 100%; 145 height: 100%;
146 left: 0; 146 left: 0;
147 top: 0; 147 top: 0;
148 - background: rgba(0,0,0,0.6); 148 + background: rgba(0, 0, 0, .6);
149 z-index: 2; 149 z-index: 2;
150 } 150 }
151 151
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 height: 100%; 155 height: 100%;
156 left: 0; 156 left: 0;
157 top: 0; 157 top: 0;
158 - background: rgba(0,0,0,0.6); 158 + background: rgba(0, 0, 0, .6);
159 z-index: 2; 159 z-index: 2;
160 160
161 .pengyouquan { 161 .pengyouquan {
@@ -10,7 +10,7 @@ body { @@ -10,7 +10,7 @@ body {
10 font-size: 12px; 10 font-size: 12px;
11 font-family: Helvetica, Arial, "黑体"; 11 font-family: Helvetica, Arial, "黑体";
12 background: #fff; 12 background: #fff;
13 - -webkit-tap-highlight-color: rgba(0,0,0,0); 13 + -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
14 overflow-x: hidden; 14 overflow-x: hidden;
15 } 15 }
16 16
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 text-align: center; 27 text-align: center;
28 28
29 &:after { 29 &:after {
30 - content: ''; 30 + content: "";
31 display: block; 31 display: block;
32 width: 100%; 32 width: 100%;
33 height: 10px; 33 height: 10px;
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 line-height: 1.25; 83 line-height: 1.25;
84 84
85 &:before { 85 &:before {
86 - content: ''; 86 + content: "";
87 display: block; 87 display: block;
88 width: 100%; 88 width: 100%;
89 height: 40px; 89 height: 40px;
@@ -8,14 +8,14 @@ @@ -8,14 +8,14 @@
8 8
9 html, 9 html,
10 body { 10 body {
11 - -webkit-tap-highlight-color: rgba(0,0,0,0); 11 + -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
12 overflow-x: hidden; 12 overflow-x: hidden;
13 } 13 }
14 14
15 body { 15 body {
16 font-size: 12px; 16 font-size: 12px;
17 font-family: Helvetica, Arial, "黑体"; 17 font-family: Helvetica, Arial, "黑体";
18 - background: #fff;/*f0eff1*/ 18 + background: #fff; /* f0eff1 */
19 } 19 }
20 20
21 input, 21 input,
@@ -16,17 +16,17 @@ @@ -16,17 +16,17 @@
16 } 16 }
17 17
18 .share { 18 .share {
19 - margin: 0px auto 30px; 19 + margin: 0 auto 30px;
20 width: 560px; 20 width: 560px;
21 height: 80px; 21 height: 80px;
22 font-size: 29px; 22 font-size: 29px;
23 line-height: 80px; 23 line-height: 80px;
24 color: #fff; 24 color: #fff;
25 - background: #d25d7f;; 25 + background: #d25d7f;
26 text-align: center; 26 text-align: center;
27 27
28 &:after { 28 &:after {
29 - content: ''; 29 + content: "";
30 display: block; 30 display: block;
31 width: 100%; 31 width: 100%;
32 height: 10px; 32 height: 10px;
@@ -43,8 +43,8 @@ @@ -43,8 +43,8 @@
43 } 43 }
44 44
45 .banner-border { 45 .banner-border {
46 - border-left: 3px solid #444444;  
47 - border-right: 3px solid #444444; 46 + border-left: 3px solid #444;
  47 + border-right: 3px solid #444;
48 background-color: #f1f1f9; 48 background-color: #f1f1f9;
49 padding-top: 30px; 49 padding-top: 30px;
50 } 50 }
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 transform: translate(-50%, -50%); 110 transform: translate(-50%, -50%);
111 111
112 &:before { 112 &:before {
113 - content: ''; 113 + content: "";
114 display: block; 114 display: block;
115 width: 100%; 115 width: 100%;
116 height: 54px; 116 height: 54px;
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 height: 100%; 151 height: 100%;
152 left: 0; 152 left: 0;
153 top: 0; 153 top: 0;
154 - background: rgba(0,0,0,0.6); 154 + background: rgba(0, 0, 0, .6);
155 z-index: 2; 155 z-index: 2;
156 } 156 }
157 157
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 height: 100%; 161 height: 100%;
162 left: 0; 162 left: 0;
163 top: 0; 163 top: 0;
164 - background: rgba(0,0,0,0.6); 164 + background: rgba(0, 0, 0, .6);
165 z-index: 2; 165 z-index: 2;
166 166
167 .pengyouquan { 167 .pengyouquan {