From 7e0c1182a339affe31112f22095d5f1f411c1101 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 22:26:29 +0800
Subject: [PATCH] no message

Former-commit-id: af527fe7b8b689f3564c6e07f16af6250709e895
Former-commit-id: b4770d337e13dbeaf9215e09293b7006df693e67
Former-commit-id: dab7359d32619f32d48aadd091a555ffbf8511dc
---
 src/assets/style/theme/d2/index.scss     | 11 ++++++-----
 src/assets/style/theme/d2/setting.scss   |  3 ++-
 src/assets/style/theme/star/index.scss   | 11 +++++++----
 src/assets/style/theme/star/setting.scss |  3 ++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/assets/style/theme/d2/index.scss b/src/assets/style/theme/d2/index.scss
index cad7dab9..c135eb15 100644
--- a/src/assets/style/theme/d2/index.scss
+++ b/src/assets/style/theme/d2/index.scss
@@ -30,22 +30,23 @@
 
   // [组件] d2-container-full
   .d2-container-full {
-    border: $theme-container-border;
+    border: $theme-container-border-outer;
     border-bottom: none;
     .d2-container-full__header {
-      border-bottom: $theme-container-border;
+      border-bottom: $theme-container-border-inner;
     }
     .d2-container-full__footer {
-      border-top: $theme-container-border;
+      border-top: $theme-container-border-inner;
     }
   }
   // [组件] d2-container-card
   .d2-container-card {
-    border: $theme-container-border;
+    border: $theme-container-border-outer;
     .el-card__header {
-      border-bottom: $theme-container-border;
+      border-bottom: $theme-container-border-inner;
     }
   }
+  
   // 顶栏
   .el-header {
     // 切换按钮
diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index e9ce12b8..0d0a2b3c 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -5,7 +5,8 @@ $theme-bg-color: $color-bg;
 // 主题背景图片
 // $theme-bg-image: '/static/image/bg/xxx.jpg';
 // container组件的边框
-$theme-container-border: 1px solid $color-border-1;
+$theme-container-border-inner: 1px solid $color-border-1;
+$theme-container-border-outer: 1px solid $color-border-1;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index e2221d38..cc521169 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -30,20 +30,23 @@
 
   // [组件] d2-container-full
   .d2-container-full {
+    border: $theme-container-border-outer;
+    border-bottom: none;
     .d2-container-full__header {
-      border-bottom: $theme-container-border;
+      border-bottom: $theme-container-border-inner;
     }
     .d2-container-full__footer {
-      border-top: $theme-container-border;
+      border-top: $theme-container-border-inner;
     }
   }
   // [组件] d2-container-card
   .d2-container-card {
-    border: $theme-container-border;
+    border: $theme-container-border-outer;
     .el-card__header {
-      border-bottom: $theme-container-border;
+      border-bottom: $theme-container-border-inner;
     }
   }
+  
   // 顶栏
   .el-header {
     // 切换按钮
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index 11c9cb77..a2a1f59e 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -5,7 +5,8 @@ $theme-bg-color: #EFF4F8;
 // 主题背景图片
 $theme-bg-image: '/static/image/bg/star.jpg';
 // container组件的边框
-$theme-container-border: 1px solid #d8dfea;
+$theme-container-border-inner: 1px solid #d8dfea;
+$theme-container-border-outer: 1px solid #d8dfea;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;