no message

Former-commit-id: 92b430b7bc92e6207b77fa78e49825f6b8d0b26a
Former-commit-id: b47caa67a46dc037d37a94a0541642d81d7140ce
Former-commit-id: b7f3f72c8a966c4cc3ce7563c8bab27a68b325fe

src/assets/style/fixed/element.scss

@@ -1 +1,8 @@
 // element 样式补丁
+
+.el-card {
+  box-shadow: none;
+  &:hover {
+    box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
+  }
+}

src/assets/style/theme/_bak.scss

@@ -73,7 +73,7 @@ $border-color: #d8dfea;
         }
       }
       // 折叠侧边栏切换按钮
-      .toggle-sidemenu-btn {
+      .toggle-aside-btn {
         float: left;
         height: 60px;
         width: 60px;

src/assets/style/theme/star/index.scss

@@ -1,4 +1,4 @@
-@import '../theme-base.scss';
+@import '../theme.scss';
 
 $theme-name: 'star';
 $theme-bg-color: #EFF4F8;
@@ -8,6 +8,7 @@ $theme-container-full-border-color: #d8dfea;
 .theme-#{$theme-name} {
   background-color: $theme-bg-color;
   background-image: url($theme-bg-image);
+  // [组件] dd-container-full
   .dd-container-full {
     .dd-container-full__header {
       border-bottom: 1px solid $theme-container-full-border-color;
@@ -16,4 +17,25 @@ $theme-container-full-border-color: #d8dfea;
       border-top: 1px solid $theme-container-full-border-color;
     }
   }
+  .el-header {
+    .toggle-aside-btn {
+      i {
+        color: #FFF;
+        &:hover {
+          color: #FFF;
+        }
+      }
+    }
+    .el-menu {
+      .el-menu-item {
+        color: #FFF;
+        &:hover {
+          background-color: rgba(#000, 0.1);
+        }
+        &.is-active {
+          border-top-color: #FFF;
+        }
+      }
+    }
+  }
 }

src/assets/style/theme/theme-dd-container-full.scss

@@ -0,0 +1,37 @@
+.theme {
+  .dd-container-full {
+    position: absolute;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    background-color: #FFF;
+    overflow: hidden;
+    color: #303133;
+    &:hover {
+      box-shadow: none;
+    }
+    .dd-container-full__header {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      width: 100%;
+      padding: 18px 20px;
+      box-sizing: border-box;
+    }
+    .dd-container-full__body {
+      position: absolute;
+      padding: 20px;
+      left: 0px;
+      right: 0px;
+      bottom: 0px;
+      overflow: auto;
+    }
+    .dd-container-full__footer {
+      position: absolute;
+      bottom: 0px;
+      left: 0px;
+      width: 100%;
+      padding: 18px 20px;
+      box-sizing: border-box;
+    }
+  }
+}

src/assets/style/theme/theme.scss

@@ -1,5 +1,7 @@
 @import '~@/assets/style/public.scss';
 
+@import './theme-dd-container-full.scss';
+
 $theme-color: #EFF4F8;
 
 // 主题公用
@@ -8,47 +10,6 @@ $theme-color: #EFF4F8;
   width: 100vw;
   background-size: cover;
   background-position: center;
-  .el-card {
-    box-shadow: none;
-    &:hover {
-      box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
-    }
-  }
-  .dd-container-full {
-    position: absolute;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    background-color: #FFF;
-    overflow: hidden;
-    color: #303133;
-    &:hover {
-      box-shadow: none;
-    }
-    .dd-container-full__header {
-      position: absolute;
-      top: 0px;
-      left: 0px;
-      width: 100%;
-      padding: 18px 20px;
-      box-sizing: border-box;
-    }
-    .dd-container-full__body {
-      position: absolute;
-      padding: 20px;
-      left: 0px;
-      right: 0px;
-      bottom: 0px;
-      overflow: auto;
-    }
-    .dd-container-full__footer {
-      position: absolute;
-      bottom: 0px;
-      left: 0px;
-      width: 100%;
-      padding: 18px 20px;
-      box-sizing: border-box;
-    }
-  }
   // [布局] 顶栏
   .el-header {
     padding: 0px;
@@ -62,7 +23,7 @@ $theme-color: #EFF4F8;
       }
     }
     // 折叠侧边栏切换按钮
-    .toggle-sidemenu-btn {
+    .toggle-aside-btn {
       float: left;
       height: 60px;
       width: 60px;
@@ -73,11 +34,7 @@ $theme-color: #EFF4F8;
       cursor: pointer;
       i {
         font-size: 20px;
-        color: $color-text-normal;
         margin-top: 4px;
-        &:hover {
-          color: $color-primary;
-        }
       }
     }
     // [菜单] 顶栏
@@ -88,12 +45,9 @@ $theme-color: #EFF4F8;
       .el-menu-item {
         border-bottom: none;
         border-top: 2px solid transparent;
-        &:hover {
-          background-color: transparent;
-        }
         &.is-active {
           border-bottom: none;
-          border-top: 2px solid $color-primary;
+          border-top-color: $color-primary;
           background-color: transparent;
         }
       }

src/components/core/MainLayout/index.vue

@@ -6,7 +6,7 @@
         <img v-if="collapse" src="@/assets/image/logo/header-icon-only.png">
         <img v-else src="@/assets/image/logo/header.png">
       </div>
-      <div class="toggle-sidemenu-btn" @click="collapse = !collapse">
+      <div class="toggle-aside-btn" @click="collapse = !collapse">
         <Icon name="bars"/>
       </div>
       <HeaderMenu/>
@@ -50,5 +50,5 @@ export default {
 
 <style lang="scss">
 // 主题
-@import '~@/assets/style/theme/classic/index.scss';
+@import '~@/assets/style/theme/star/index.scss';
 </style>