diff --git a/package.json b/package.json index f1fd68b6..ac2c13b1 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "js-cookie": "2.1.4", "jsonlint": "1.6.2", "mockjs": "1.0.1-beta3", - "normalize.css": "3.0.2", + "normalize.css": "7.0.0", "nprogress": "0.2.0", "screenfull": "3.2.2", "showdown": "1.7.1", diff --git a/src/App.vue b/src/App.vue index a0fae218..f8b32acf 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,5 +11,6 @@ diff --git a/src/main.js b/src/main.js index 6ae05f29..a31c1a6c 100644 --- a/src/main.js +++ b/src/main.js @@ -1,10 +1,9 @@ import Vue from 'vue' +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-default/index.css' import App from './App' import router from './router' import store from './store' -import 'normalize.css/normalize.css'// normalize.css 样式格式化 -import ElementUI from 'element-ui' -import 'element-ui/lib/theme-default/index.css' import '@/assets/iconfont/iconfont' // iconfont 具体图标见https://github.com/PanJiaChen/vue-element-admin/wiki import IconSvg from '@/components/Icon-svg'// svg组件 import * as filters from '@/filters' // 全局filter