diff --git a/src/App.vue b/src/App.vue index 5aae3db..76bb961 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,8 +9,3 @@ export default { name: 'app' } - - diff --git a/src/main.js b/src/main.js index ad3356b..9d02d29 100644 --- a/src/main.js +++ b/src/main.js @@ -1,12 +1,19 @@ import Vue from 'vue' + +import 'normalize.css/normalize.css'// A modern alternative to CSS resets + import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' import locale from 'element-ui/lib/locale/lang/en' + +import '@/styles/index.scss' // global css + import App from './App' import router from './router' import store from './store' + import '@/icons' // icon -import '@/permission' // 权限 +import '@/permission' // permission control Vue.use(ElementUI, { locale }) diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index c618f7d..ef7bb5d 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -1,4 +1,4 @@ - //覆盖一些element-ui样式 覆盖css样式可在这里添加 + //to reset element-ui default css .el-upload { input[type="file"] { display: none !important;