From d908042712fab46a137da747c36077ab0704402b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 12:26:40 +0800
Subject: [PATCH] no message

Former-commit-id: 68af86c9032cbaa2b389f08c1df647725f6bc123 [formerly 763e4c0481a05ddb4ca529d608dd443bbcae13a8] [formerly 68af86c9032cbaa2b389f08c1df647725f6bc123 [formerly 763e4c0481a05ddb4ca529d608dd443bbcae13a8] [formerly 68af86c9032cbaa2b389f08c1df647725f6bc123 [formerly 763e4c0481a05ddb4ca529d608dd443bbcae13a8] [formerly 763e4c0481a05ddb4ca529d608dd443bbcae13a8 [formerly 588c55a9b3ac1572edd0bbb6138371a73c789863 [formerly b6b4304d4ca85bdbd43b1fecc769862c14576ab2]]]]]
Former-commit-id: 981b04291e9cc68583637f48cdf8a59f4a113963
Former-commit-id: 8af6a0ccd853085ebe08b6d4b26a198da1b58e8d
Former-commit-id: 966e733ac9698ac12ae75fb61c45ff820b395c8e [formerly d9992bf6c3f2009a01e1d984125cc987b59549a9]
Former-commit-id: b299c3722e4abb3cf1a1412971e268ac2824dfd0
Former-commit-id: 673d89b46b073169c60b655baefda4b4e78a05b8
Former-commit-id: 3c6bfac047adb007132947b99890a9a94169084c
Former-commit-id: 988f9ff01c1a70a11bff5217fc68426a754f9752
Former-commit-id: 4ca827fbb3632ba7430e4c80cc550fa2463b081d
---
 src/assets/style/theme/theme-base.scss               | 8 +++++++-
 src/assets/style/theme/theme.scss                    | 9 +++++++++
 src/components/core/d2-container/index.vue           | 2 +-
 src/pages/demo/components/container/ghost-header.vue | 2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index cf8423eb..d427046e 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -213,10 +213,16 @@
               border-top-left-radius: 0px;
               border-top-right-radius: 0px;
             }
-            // 隐形布局组件 这个组件不建议在有多页面导航的时候使用 不美观
+            // 隐形布局组件
             .d2-container-ghost {
               margin-right: 20px;
               margin-bottom: 20px;
+              .d2-container-ghost-header {
+                border-top: none;
+                border-top-left-radius: 0px;
+                border-top-right-radius: 0px;
+                margin-bottom: 20px;
+              }
             }
           }
         }
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index c09a7e93..d5cd96d7 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -281,6 +281,15 @@
               background: $theme-container-background-color;
             }
           }
+          // 隐形布局组件
+          .d2-container-ghost {
+            .d2-container-ghost-header {
+              border: $theme-container-border-outer;
+              &>.el-card__body {
+                background: $theme-container-header-footer-background-color;
+              }
+            }
+          }
         }
       }
     }
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index ea7df202..1dafcf6c 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -7,7 +7,7 @@
     </el-card>
     <!-- [ghost] 隐形的容器 -->
     <div v-if="type === 'ghost'" class="d2-container-ghost">
-      <el-card v-if="$slots.header">
+      <el-card v-if="$slots.header" shadow="never" class="d2-container-ghost-header">
         <slot name="header"/>
       </el-card>
       <slot/>
diff --git a/src/pages/demo/components/container/ghost-header.vue b/src/pages/demo/components/container/ghost-header.vue
index 49ac04cc..bf4d2f21 100644
--- a/src/pages/demo/components/container/ghost-header.vue
+++ b/src/pages/demo/components/container/ghost-header.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container type="ghost">
     <template slot="header">header</template>
-    <el-card shadow="never" class="d2-mt" style="width: 50%;">
+    <el-card shadow="never" style="width: 50%;">
       <d2-markdown :source="doc"/>
     </el-card>
   </d2-container>