From c0ec0c693dcdb547b2317106397d22a9495deba3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 29 Jun 2018 20:04:07 +0800
Subject: [PATCH] no message

Former-commit-id: 09ef48d854bee9d67685467a8b19fe941c8855d6 [formerly 09ef48d854bee9d67685467a8b19fe941c8855d6 [formerly 09ef48d854bee9d67685467a8b19fe941c8855d6 [formerly 09ef48d854bee9d67685467a8b19fe941c8855d6 [formerly 44d9587a3143ee2e003883dd12b96f3ea43205b5 [formerly 0a8388192e623b73644101dbc992f14890df59dd]]]]]
Former-commit-id: 3e10bf19a87d565dfa960c9afb9433250a8a6d2f
Former-commit-id: 110d487eb33aa979ccee30534dd5740181010deb
Former-commit-id: 05ba3834fcf04d8944f3155763828846b38b63df [formerly 125d91e90050b68f24b55c4861308724828230b8]
Former-commit-id: 7a7f4aec67fb8a2fd60be3ce3e406426e1d1b4d3
Former-commit-id: c9503c0c45d7123fe92f8ce3d9c4e91f7507179c
Former-commit-id: 169170a337c1e6eb76093f4f9d27ba98ec15a1dc
Former-commit-id: 2043d96af7ed02cc58837d94c341d209412d238d
Former-commit-id: dabb6f0e7cb3426e5bf6676a9e0c89f846ec1653
---
 src/assets/style/theme/star/setting.scss  | 2 +-
 src/pages/demo/playground/theme/index.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index 69d8f836..88fd3954 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -8,7 +8,7 @@ $theme-bg-mask: rgba(#000, .3);
 // container组件
 $theme-container-background-color: rgba(#FFF, .9);
 $theme-container-header-footer-background-color: #FFF;
-$theme-container-border-inner: 1px solid #114450;
+$theme-container-border-inner: 1px solid $color-border-1;
 $theme-container-border-outer: 1px solid #114450;
 
 $theme-multiple-page-control-color: #FFF;
diff --git a/src/pages/demo/playground/theme/index.vue b/src/pages/demo/playground/theme/index.vue
index ae98ef2b..a0f8636b 100644
--- a/src/pages/demo/playground/theme/index.vue
+++ b/src/pages/demo/playground/theme/index.vue
@@ -17,7 +17,9 @@
         </template>
       </el-table-column>
     </el-table>
-    <template slot="footer">hELLO</template>
+    <template slot="footer">
+      <el-button type="primary" size="small">当前激活主题 {{themeActive.name}}</el-button>
+    </template>
   </d2-container>
 </template>
 
@@ -52,8 +54,6 @@ export default {
 <style lang="scss" scoped>
 @import '~@/assets/style/public.scss';
 .page-demo-playground-theme {
-  // filter: grayscale(100%);
-  // filter: gray;
   .theme-preview {
     height: 50px;
     width: 100px;