zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refine import normalize.css && update

This commit is contained in:
Pan 2017-08-21 20:55:56 +08:00
parent aa5f9059b3
commit d06d476b50
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -22,7 +22,7 @@
"js-cookie": "2.1.4", "js-cookie": "2.1.4",
"jsonlint": "1.6.2", "jsonlint": "1.6.2",
"mockjs": "1.0.1-beta3", "mockjs": "1.0.1-beta3",
"normalize.css": "3.0.2", "normalize.css": "7.0.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"screenfull": "3.2.2", "screenfull": "3.2.2",
"showdown": "1.7.1", "showdown": "1.7.1",

1
src/App.vue
View File

@ -11,5 +11,6 @@
</script> </script>
<style lang="scss"> <style lang="scss">
@import '~normalize.css/normalize.css';// normalize.css 样式格式化
@import './styles/index.scss'; // 全局自定义的css样式 @import './styles/index.scss'; // 全局自定义的css样式
</style> </style>

5
src/main.js
View File

@ -1,10 +1,9 @@
import Vue from 'vue' import Vue from 'vue'
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-default/index.css'
import App from './App' import App from './App'
import router from './router' import router from './router'
import store from './store' 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 '@/assets/iconfont/iconfont' // iconfont 具体图标见https://github.com/PanJiaChen/vue-element-admin/wiki
import IconSvg from '@/components/Icon-svg'// svg组件 import IconSvg from '@/components/Icon-svg'// svg组件
import * as filters from '@/filters' // 全局filter import * as filters from '@/filters' // 全局filter