Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
felixpy committed Dec 24, 2018
2 parents 4c5713a + 83416b6 commit dde87a6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/styles/theme/element-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';

0 comments on commit dde87a6

Please sign in to comment.