From 170df2d8b624fa07c5b99db44ecbad1fa0d25d33 Mon Sep 17 00:00:00 2001 From: iizmg Date: Thu, 23 Apr 2020 15:54:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/package.json | 3 + admin/src/App.vue | 20 +--- admin/src/assets/css/glob.css | 9 ++ admin/src/assets/css/reset.css | 48 ++++++++ admin/src/assets/scss/element-variables.scss | 11 ++ admin/src/components/HelloWorld.vue | 117 ------------------- admin/src/main.js | 7 +- admin/src/router/index.js | 11 +- 8 files changed, 85 insertions(+), 141 deletions(-) create mode 100644 admin/src/assets/css/glob.css create mode 100644 admin/src/assets/css/reset.css create mode 100644 admin/src/assets/scss/element-variables.scss delete mode 100644 admin/src/components/HelloWorld.vue diff --git a/admin/package.json b/admin/package.json index 9640408..2bc6e69 100644 --- a/admin/package.json +++ b/admin/package.json @@ -46,6 +46,7 @@ "html-webpack-plugin": "^2.30.1", "nightwatch": "^0.9.12", "node-notifier": "^5.1.2", + "node-sass": "^4.13.1", "optimize-css-assets-webpack-plugin": "^3.2.0", "ora": "^1.2.0", "portfinder": "^1.0.13", @@ -53,9 +54,11 @@ "postcss-loader": "^2.0.8", "postcss-url": "^7.2.1", "rimraf": "^2.6.0", + "sass-loader": "^7.3.1", "selenium-server": "^3.0.1", "semver": "^5.3.0", "shelljs": "^0.7.6", + "style-loader": "^1.1.4", "uglifyjs-webpack-plugin": "^1.1.1", "url-loader": "^0.5.8", "vue-loader": "^13.3.0", diff --git a/admin/src/App.vue b/admin/src/App.vue index d74c648..d26b4e3 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -1,23 +1,11 @@ - - diff --git a/admin/src/assets/css/glob.css b/admin/src/assets/css/glob.css new file mode 100644 index 0000000..59835e0 --- /dev/null +++ b/admin/src/assets/css/glob.css @@ -0,0 +1,9 @@ +#app { + position: relative; + width: 100%; + height: 100%; + overflow: hidden; + font-family: 'Microsoft yahei'; + font-size: 13px; + font-weight: 400; +} diff --git a/admin/src/assets/css/reset.css b/admin/src/assets/css/reset.css new file mode 100644 index 0000000..d9f27b5 --- /dev/null +++ b/admin/src/assets/css/reset.css @@ -0,0 +1,48 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/admin/src/assets/scss/element-variables.scss b/admin/src/assets/scss/element-variables.scss new file mode 100644 index 0000000..805a8a3 --- /dev/null +++ b/admin/src/assets/scss/element-variables.scss @@ -0,0 +1,11 @@ +/* 改变主题色变量 */ +$--color-primary: rgb(51, 102, 153); +$--color-success: #dcdfe6 !default; + +/* 改变disabled状态下字色 */ +$--disabled-color-base: #606266; + +/* 改变 icon 字体路径变量，必需 */ +$--font-path: "~element-ui/lib/theme-chalk/fonts"; + +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/admin/src/components/HelloWorld.vue b/admin/src/components/HelloWorld.vue deleted file mode 100644 index 8ce8cd3..0000000 --- a/admin/src/components/HelloWorld.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - diff --git a/admin/src/main.js b/admin/src/main.js index 4605e7c..aebdd00 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -5,8 +5,11 @@ import App from './App' import router from './router' import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; -import axios from 'axios' -import VueAxios from 'vue-axios' +import axios from 'axios'; +import VueAxios from 'vue-axios'; +import './assets/css/reset.css'; +import './assets/css/glob.css'; +import './assets/scss/element-variables.scss'; Vue.config.productionTip = false Vue.use(ElementUI); diff --git a/admin/src/router/index.js b/admin/src/router/index.js index 5fa7f9d..1e89130 100644 --- a/admin/src/router/index.js +++ b/admin/src/router/index.js @@ -1,15 +1,14 @@ import Vue from 'vue' import Router from 'vue-router' -import HelloWorld from '@/components/HelloWorld' Vue.use(Router) export default new Router({ routes: [ - { - path: '/', - name: 'HelloWorld', - component: HelloWorld - } + // { + // path: '/', + // name: 'HelloWorld', + // component: HelloWorld + // } ] })