From 64463f43d083164dd9099f299cfaeb45007a6cea Mon Sep 17 00:00:00 2001
From: BoBoooooo <17746714@qq.com>
Date: Sat, 29 Dec 2018 14:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=A8=E5=B1=80CSS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/btn.scss                         |  3 ++
 src/styles/index.scss                       | 28 +++--------------
 src/styles/layout.scss                      | 35 ++++++++++++---------
 src/styles/variables.scss                   |  2 +-
 src/views/Archive/person_count.vue          |  2 +-
 src/views/Archive/person_detail.vue         |  2 +-
 src/views/Archive/person_edit.vue           |  2 +-
 src/views/DouBan/book.vue                   |  2 +-
 src/views/DouBan/movie.vue                  |  2 +-
 src/views/DouBan/music.vue                  |  2 +-
 src/views/DouBan/zhihu.vue                  |  2 +-
 src/views/dashboard/index.vue               |  8 ++---
 src/views/layout/components/Navbar.vue      |  6 ++--
 src/views/layout/components/SidebarItem.vue |  4 ---
 src/views/layout/components/TagsView.vue    |  5 +--
 src/views/system/dept.vue                   |  2 +-
 src/views/system/formdesigner.vue           |  1 -
 src/views/system/role.vue                   |  2 +-
 src/views/system/users.vue                  |  2 +-
 19 files changed, 50 insertions(+), 62 deletions(-)

diff --git a/src/styles/btn.scss b/src/styles/btn.scss
index 0c5ee76..083e588 100644
--- a/src/styles/btn.scss
+++ b/src/styles/btn.scss
@@ -38,6 +38,9 @@
 .yellow-btn {
   @include colorBtn($yellow)
 }
+.primary-btn {
+  @include colorBtn($primary)
+}
 
 .pan-btn {
   font-size: 14px;
diff --git a/src/styles/index.scss b/src/styles/index.scss
index a4aed5f..1db8634 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -131,14 +131,6 @@ code {
   padding: 20px;
 }
 
-.components-container {
-  margin: 30px 50px;
-  position: relative;
-}
-
-.pagination-container {
-  margin-top: 30px;
-}
 
 .text-center {
   text-align: center
@@ -174,20 +166,10 @@ code {
   }
 }
 
-.filter-container {
-  padding-bottom: 10px;
-  .filter-item {
-    display: inline-block;
-    vertical-align: middle;
-    margin-bottom: 10px;
-  }
-}
-
-//refine vue-multiselect plugin
-.multiselect {
-  line-height: 16px;
-}
 
-.multiselect--active {
-  z-index: 1000 !important;
+.widget-box{
+  background: #fff;
+  margin-bottom: 1.875rem;
+  padding:1.875rem;
+  box-shadow: 0 4px 70px -18px #707070;
 }
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index 6dab30f..8d6ede9 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -25,12 +25,11 @@
       padding:24px 44px 24px 0 ;
       position: relative;
       .app-main {
-        margin-top:1.875rem;
-        width: 100%;
-        box-shadow: 0 4px 70px -18px #707070;
+        // margin-top:1.875rem;
+        // box-shadow: 0 4px 70px -18px #707070;
 
-        background: white;
-        height:100%;
+        // background: white;
+        // height:100%;
         position: relative;
         overflow: auto;
       }
@@ -77,6 +76,9 @@
     }
     .el-submenu__icon-arrow{
       color:$primary;
+      &:hover{
+        color:white!important;
+      }
     }
     .is-horizontal {
       display: none;
@@ -89,6 +91,9 @@
     .svg-icon {
       margin-right: 16px;
       fill:$primary;
+      &:hover{
+        fill:white!important;
+      }
     }
     .el-menu {
       border: none;
@@ -99,9 +104,10 @@
   .hideSidebar {
     .sidebar-container {
       width: 36px !important;
+      left:0px!important;
     }
     .main-container {
-      margin-left: 36px;
+      margin-left: 60px;
     }
     .submenu-title-noDropdown {
       padding-left: 10px !important;
@@ -133,14 +139,15 @@
       }
     }
   }
-  // .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
-  // .sidebar-container .el-submenu .el-menu-item {
-  //   min-width: 180px !important;
-  //   background-color: $subMenuBg !important;
-  //   &:hover {
-  //     background-color: $menuHover !important;
-  //   }
-  // }
+
+  .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
+  .sidebar-container .el-submenu .el-menu-item {
+    // background-color: $subMenuBg !important;
+    &:hover {
+      background-color: $menuHover !important;
+    }
+   
+  }
   .el-menu--collapse .el-menu .el-submenu {
     min-width: 225px !important;
   }
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 3d3aff8..1115b8e 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -10,4 +10,4 @@ $primary:#4ae387;
 //sidebar
 $menuBg:#292421;
 $subMenuBg:#292421;
-$menuHover:#001528;
+$menuHover:#222;
diff --git a/src/views/Archive/person_count.vue b/src/views/Archive/person_count.vue
index b21d079..2a86cdd 100644
--- a/src/views/Archive/person_count.vue
+++ b/src/views/Archive/person_count.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="person_count"
-    style="width:100%">
+    style="width:100%" class="widget-box">
     <mix-chart
       id="chart1"
       width="100%"
diff --git a/src/views/Archive/person_detail.vue b/src/views/Archive/person_detail.vue
index 2ca106d..7fb9084 100644
--- a/src/views/Archive/person_detail.vue
+++ b/src/views/Archive/person_detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="person"
-    class="app-container">
+    class="app-container  widget-box">
 
     <common-tool-bar
       :option-json ="jsonData.config.columnList"
diff --git a/src/views/Archive/person_edit.vue b/src/views/Archive/person_edit.vue
index 665aecb..77732ca 100644
--- a/src/views/Archive/person_edit.vue
+++ b/src/views/Archive/person_edit.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="person"
-    class="app-container">
+    class="app-container widget-box">
 
     <common-tool-bar
       :option-json ="jsonData.config.columnList"
diff --git a/src/views/DouBan/book.vue b/src/views/DouBan/book.vue
index 0558792..510156f 100644
--- a/src/views/DouBan/book.vue
+++ b/src/views/DouBan/book.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="movie"
-    class="app-container">
+    class=" widget-box">
     <h2>图书查询</h2>
     <el-input
       v-model="criteria"
diff --git a/src/views/DouBan/movie.vue b/src/views/DouBan/movie.vue
index 9d6adab..d5d25cd 100644
--- a/src/views/DouBan/movie.vue
+++ b/src/views/DouBan/movie.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="movie"
-    class="app-container">
+    class=" widget-box">
     <h2>近期热映电影</h2>
     <el-table
       v-loading.body="listLoading"
diff --git a/src/views/DouBan/music.vue b/src/views/DouBan/music.vue
index 8388344..27ed7d3 100644
--- a/src/views/DouBan/music.vue
+++ b/src/views/DouBan/music.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="movie"
-    class="app-container">
+    class=" widget-box">
     <h2>音乐查询</h2>
     <el-input
       v-model="criteria"
diff --git a/src/views/DouBan/zhihu.vue b/src/views/DouBan/zhihu.vue
index 92a5226..c660a27 100644
--- a/src/views/DouBan/zhihu.vue
+++ b/src/views/DouBan/zhihu.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="dashboard-container">
+  <div class="widget-box">
     <github-corner />
 
     <el-row>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 03f1d19..a7a32b6 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,19 +1,19 @@
 <template>
-  <div class="dashboard-editor-container">
+  <div>
 
     <el-row :gutter="32">
       <el-col :xs="24" :sm="24" :lg="8">
-        <el-card shadow="always">
+        <el-card shadow="always" class="widget-box">
       总是显示
     </el-card>
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
-        <el-card shadow="always">
+        <el-card shadow="always" class="widget-box">
       总是显示
     </el-card>
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
-        <el-card shadow="always">
+        <el-card shadow="always" class="widget-box">
       总是显示
     </el-card>
       </el-col>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index dc72fc1..86263ba 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -8,7 +8,7 @@
       :is-active="sidebar.opened"
       class="hamburger-container"/>
     <!-- <breadcrumb class="breadcrumb-container"/> -->
-    <span style="display:inline-block;width:70%;margin:0 auto;text-align:center">Anshare Tech</span>
+    <span style="display:inline-block;width:70%;margin:0 auto;text-align:center">Anshare Tech <span style="color:#4ae867">©2019 BoBo</span> </span>
         <Screenfull class="screenfull"/>
 
     <el-dropdown
@@ -101,8 +101,8 @@ export default {
     position:relative;
     border-radius: 0px !important;
     .hamburger-container {
-      line-height: 72px;
-      height: 72px;
+      line-height: 80px;
+      height: 80px;
           color:white;
 
       float: left;
diff --git a/src/views/layout/components/SidebarItem.vue b/src/views/layout/components/SidebarItem.vue
index 739df54..283e2be 100644
--- a/src/views/layout/components/SidebarItem.vue
+++ b/src/views/layout/components/SidebarItem.vue
@@ -59,10 +59,6 @@ export default {
     },
   },
 }
-/*
- <i class="fontcontainer">
-              <span class="iconfont" v-if="onlyOneChild.meta&&onlyOneChild.meta.icon" :class="onlyOneChild.meta.icon"></span>
-          </i>* */
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index fefff90..d1d2f43 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="tags-view-container">
+  <div class="tags-view-container widget-box">
     <scroll-pane
       ref="scrollPane"
       class="tags-view-wrapper">
@@ -141,11 +141,12 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .tags-view-container {
+      padding:0px!important;
+
   .tags-view-wrapper {
     background: #fff;
     height: 54px;
     border-bottom: 1px solid #d8dce5;
-      box-shadow: 0 4px 70px -18px #707070;
     .tags-view-item {
       display: inline-block;
       position: relative;
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index d1fb29f..23c0822 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="dept"
-    class="app-container">
+    class=" widget-box">
 
     <el-button
       type="primary"
diff --git a/src/views/system/formdesigner.vue b/src/views/system/formdesigner.vue
index 95bd7a9..ec0949e 100644
--- a/src/views/system/formdesigner.vue
+++ b/src/views/system/formdesigner.vue
@@ -2,7 +2,6 @@
   <div
     id="formdesigner"
     ref="container"
-    class="app-container"
     style="padding-top:0px"
   >
     <MakingForm ref="form" />
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index d213adb..51893f6 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="role"
-    class="app-container">
+    class=" widget-box">
     <el-button
       type="primary"
       size="small"
diff --git a/src/views/system/users.vue b/src/views/system/users.vue
index 1a46bf0..4539ce8 100644
--- a/src/views/system/users.vue
+++ b/src/views/system/users.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     id="users"
-    class="app-container">
+    class=" widget-box">
 
     <el-button
       type="primary"