From 267dc854d8c4dd76ab737272b6a4e406980bba12 Mon Sep 17 00:00:00 2001 From: lin-xin <2981207131@qq.com> Date: Wed, 18 Apr 2018 15:39:58 +0800 Subject: [PATCH] =?UTF-8?q?'=E6=96=B0=E5=A2=9E=E6=A0=87=E7=AD=BE=E9=A1=B5?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=8A=9F=E8=83=BD'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Home.vue | 14 ++- src/components/common/Tags.vue | 161 +++++++++++++++++++++++++ src/router/index.js | 27 +++-- static/css/color-dark.css | 38 +++--- static/css/main.css | 8 +- static/css/theme-green/color-green.css | 4 + 6 files changed, 220 insertions(+), 32 deletions(-) create mode 100644 src/components/common/Tags.vue diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue index 23e3559..1950323 100644 --- a/src/components/common/Home.vue +++ b/src/components/common/Home.vue @@ -2,8 +2,15 @@
-
- +
+ +
+ + + + + +
@@ -11,6 +18,7 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index ecd8f5d..e811177 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,49 +12,58 @@ export default new Router({ { path: '/readme', component: resolve => require(['../components/common/Home.vue'], resolve), + meta: { title: '自述文件' }, children:[ { path: '/', - component: resolve => require(['../components/page/Readme.vue'], resolve) + component: resolve => require(['../components/page/Readme.vue'], resolve), + meta: { title: '自述文件' } }, { path: '/table', - component: resolve => require(['../components/page/BaseTable.vue'], resolve) + component: resolve => require(['../components/page/BaseTable.vue'], resolve), + meta: { title: '基础表格' } }, { path: '/form', - component: resolve => require(['../components/page/BaseForm.vue'], resolve) + component: resolve => require(['../components/page/BaseForm.vue'], resolve), + meta: { title: '基本表单' } }, { // 富文本编辑器组件 path: '/editor', - component: resolve => require(['../components/page/VueEditor.vue'], resolve) + component: resolve => require(['../components/page/VueEditor.vue'], resolve), + meta: { title: '富文本编辑器' } }, { // markdown组件 path: '/markdown', - component: resolve => require(['../components/page/Markdown.vue'], resolve) + component: resolve => require(['../components/page/Markdown.vue'], resolve), + meta: { title: 'markdown编辑器' } }, { // 图片上传组件 path: '/upload', - component: resolve => require(['../components/page/Upload.vue'], resolve) + component: resolve => require(['../components/page/Upload.vue'], resolve), + meta: { title: '文件上传' } }, { // vue-schart组件 path: '/charts', - component: resolve => require(['../components/page/BaseCharts.vue'], resolve) + component: resolve => require(['../components/page/BaseCharts.vue'], resolve), + meta: { title: 'schart图表' } }, { // 拖拽列表组件 path: '/drag', - component: resolve => require(['../components/page/DragList.vue'], resolve) + component: resolve => require(['../components/page/DragList.vue'], resolve), + meta: { title: '拖拽列表' } }, { // 权限页面 path: '/permission', component: resolve => require(['../components/page/Permission.vue'], resolve), - meta: {permission: true} + meta: { title: '权限测试', permission: true } } ] }, diff --git a/static/css/color-dark.css b/static/css/color-dark.css index 7e4aecc..fa8fdb5 100644 --- a/static/css/color-dark.css +++ b/static/css/color-dark.css @@ -1,18 +1,22 @@ -.header{ - background-color: #242f42; -} -.login-wrap{ - background: #324157; -} -.plugins-tips{ - background: #eef1f6; -} -.plugins-tips a{ - color: #20a0ff; -} -.el-upload--text em { - color: #20a0ff; -} -.pure-button{ - background: #20a0ff; +.header{ + background-color: #242f42; +} +.login-wrap{ + background: #324157; +} +.plugins-tips{ + background: #eef1f6; +} +.plugins-tips a{ + color: #20a0ff; +} +.el-upload--text em { + color: #20a0ff; +} +.pure-button{ + background: #20a0ff; +} +.tags-li.active { + border: 1px solid #409EFF; + background-color: #409EFF; } \ No newline at end of file diff --git a/static/css/main.css b/static/css/main.css index b01f4a0..84f5f3c 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -8,17 +8,19 @@ body{ font-family:'PingFang SC', "Helvetica Neue",Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif; } a{text-decoration: none} -.content{ - background: none repeat scroll 0 0 #f0f0f0; +.content-box{ position: absolute; left: 250px; right: 0; top: 70px; bottom:0; + overflow-y: scroll; +} +.content{ + background: none repeat scroll 0 0 #f0f0f0; width: auto; padding:40px; box-sizing: border-box; - overflow-y: scroll; -webkit-transition: left .3s ease-in-out; transition: left .3s ease-in-out; } diff --git a/static/css/theme-green/color-green.css b/static/css/theme-green/color-green.css index 7a19ed6..f0323d6 100644 --- a/static/css/theme-green/color-green.css +++ b/static/css/theme-green/color-green.css @@ -19,4 +19,8 @@ .pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus, .pagination > .active > span, .pagination > .active > span:hover, .pagination > .active > span:focus { background-color: #00d1b2 !important; border-color: #00d1b2 !important; +} +.tags-li.active { + border: 1px solid #00d1b2; + background-color: #00d1b2; } \ No newline at end of file