Pan 7 years ago
parent
commit
12012e3b24
3 changed files with 9 additions and 7 deletions
  1. 0 5
      src/App.vue
  2. 8 1
      src/main.js
  3. 1 1
      src/styles/element-ui.scss

+ 0 - 5
src/App.vue

@@ -9,8 +9,3 @@ export default {
   name: 'app'
 }
 </script>
-
-<style lang="scss">
-  // @import '~normalize.css/normalize.css';// normalize.css 样式格式化
-  @import './styles/index.scss'; // 全局自定义的css样式
-</style>

+ 8 - 1
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 })
 

+ 1 - 1
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;