Merge branch 'release/1.0.2'

felixpy · felixpy · commit dde87a6f5188 · 2018-12-24T22:30:52.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-admin",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A dead simple but powerful vue admin with Vue CLI 3 and ElementUI.",
   "keywords": [
     "vue",
diff --git a/src/styles/theme/element-variables.scss b/src/styles/theme/element-variables.scss
@@ -2,4 +2,4 @@ $--color-primary: #409eff;
 
 $--font-path: '~element-ui/lib/theme-chalk/fonts';
 
-@import "~element-ui/packages/theme-chalk/src/index";
+@import '~element-ui/packages/theme-chalk/src/index';

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "element-admin",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"description": "A dead simple but powerful vue admin with Vue CLI 3 and ElementUI.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"vue",`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ $--color-primary: #409eff;`
`2`	`2`
`3`	`3`	`$--font-path: '~element-ui/lib/theme-chalk/fonts';`
`4`	`4`
`5`		`-@import "~element-ui/packages/theme-chalk/src/index";`
	`5`	`+@import '~element-ui/packages/theme-chalk/src/index';`