From e41f583803cf7299b1b451f92ecfc14aeeafd3ef Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 15:18:09 +0800
Subject: [PATCH] no message

Former-commit-id: 576684d8aafb9b67dc24f405c1d3a5fef4b785ae
Former-commit-id: 651df7589d479c39b17453a8213c661f1feec434
Former-commit-id: bdcf1f2a639a25e840f47eb5766e4011cb408682
---
 src/assets/style/theme/_bak.scss              |  2 +-
 src/assets/style/theme/star/index.scss        | 14 ++++++
 .../style/theme/theme-dd-container-full.scss  | 37 ---------------
 src/assets/style/theme/theme.scss             | 45 +++++++++++++++----
 .../components/HeaderRight/index.vue          |  2 +-
 5 files changed, 53 insertions(+), 47 deletions(-)
 delete mode 100644 src/assets/style/theme/theme-dd-container-full.scss

diff --git a/src/assets/style/theme/_bak.scss b/src/assets/style/theme/_bak.scss
index c767b8b0..a0122f66 100644
--- a/src/assets/style/theme/_bak.scss
+++ b/src/assets/style/theme/_bak.scss
@@ -110,7 +110,7 @@ $border-color: #d8dfea;
         }
       }
       // 顶栏右侧的按钮
-      .btn-group {
+      .dd-header-right {
         float: right;
         height: 60px;
         display: flex;
diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 63141e02..e52f0a04 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -17,7 +17,9 @@ $theme-container-full-border-color: #d8dfea;
       border-top: 1px solid $theme-container-full-border-color;
     }
   }
+  // 顶栏
   .el-header {
+    // 切换按钮
     .toggle-aside-btn {
       i {
         color: #FFF;
@@ -26,6 +28,7 @@ $theme-container-full-border-color: #d8dfea;
         }
       }
     }
+    // 菜单
     .el-menu {
       .el-menu-item {
         color: #FFF;
@@ -37,5 +40,16 @@ $theme-container-full-border-color: #d8dfea;
         }
       }
     }
+    // 顶栏右侧
+    .dd-header-right {
+      .btn-text {
+        color: #FFF;
+      }
+      .el-dropdown {
+        .el-dropdown-link {
+          color: #FFF;
+        }
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-dd-container-full.scss b/src/assets/style/theme/theme-dd-container-full.scss
deleted file mode 100644
index 4d6c95a8..00000000
--- a/src/assets/style/theme/theme-dd-container-full.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-.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;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index bfc165bd..761f65a0 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -1,7 +1,5 @@
 @import '~@/assets/style/public.scss';
 
-@import './theme-dd-container-full.scss';
-
 $theme-color: #EFF4F8;
 
 // 主题公用
@@ -46,21 +44,16 @@ $theme-color: #EFF4F8;
         border-bottom: none;
         border-top: 2px solid transparent;
         &.is-active {
-          border-bottom: none;
-          border-top-color: $color-primary;
           background-color: transparent;
         }
       }
     }
     // 顶栏右侧的按钮
-    .btn-group {
+    .dd-header-right {
       float: right;
       height: 60px;
       display: flex;
       align-items: center;
-      .btn-text {
-        color: $color-text-normal;
-      }
       .el-dropdown {
         user-select: none;
         cursor: pointer;
@@ -107,4 +100,40 @@ $theme-color: #EFF4F8;
       overflow: hidden;
     }
   }
+  // [组件] dd-container-full
+  .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;
+    }
+  }
 }
diff --git a/src/components/core/MainLayout/components/HeaderRight/index.vue b/src/components/core/MainLayout/components/HeaderRight/index.vue
index 78a7afed..83a10546 100644
--- a/src/components/core/MainLayout/components/HeaderRight/index.vue
+++ b/src/components/core/MainLayout/components/HeaderRight/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="btn-group">
+  <div class="dd-header-right">
     <FullScreen></FullScreen>
     <UserDropdown></UserDropdown>
   </div>