From 165ae5d6a212ce712a5fd259bb4e4bed41fca79b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 3 Jun 2018 19:11:15 +0800
Subject: [PATCH] no message

Former-commit-id: fe0e951f1addef7d9a1bdcb923a404a38581db6a
Former-commit-id: 705fe2d2573ed81dad4a16b61b6585b1d831828f
Former-commit-id: 28e7a04fc692395cb7405f81cf6ce6c118ee74be
---
 .../theme/{default.scss => classic.scss}      | 20 +++++++++----------
 src/components/core/CardFull/index.vue        | 12 +++++++----
 src/components/core/Container/index.vue       |  2 +-
 src/components/core/MainLayout/index.vue      |  4 ++--
 .../demo/plugins/clipboard-polyfill/demo.vue  |  3 ++-
 5 files changed, 22 insertions(+), 19 deletions(-)
 rename src/assets/style/theme/{default.scss => classic.scss} (87%)

diff --git a/src/assets/style/theme/default.scss b/src/assets/style/theme/classic.scss
similarity index 87%
rename from src/assets/style/theme/default.scss
rename to src/assets/style/theme/classic.scss
index 2574a94d..f1631be3 100644
--- a/src/assets/style/theme/default.scss
+++ b/src/assets/style/theme/classic.scss
@@ -1,13 +1,11 @@
 @import '~@/assets/style/public.scss';
 
-$color: #409EFF;
-
 // 默认主题
 .layout-main {
-  &.default {
+  &.classic {
     height: 100vh;
     width: 100vw;
-    background-color: $color-bg;
+    background-color: #EFF4F8;
     // [全局设置]
     // 关闭所有卡片的阴影
     .el-card {
@@ -52,13 +50,13 @@ $color: #409EFF;
         background-color: transparent;
         .el-menu-item {
           border-bottom: none;
-          border-top: 2px solid $color-bg;
+          border-top: 2px solid #EFF4F8;
           &:hover {
             background-color: transparent;
           }
           &.is-active {
             border-bottom: none;
-            border-top: 2px solid $color;
+            border-top: 2px solid $color-primary;
             background-color: transparent;
           }
         }
@@ -94,12 +92,12 @@ $color: #409EFF;
           color: $color-text-sub;
         }
         .el-menu {
-          background-color: $color-bg;
+          background-color: transparent;
           border-right: none;
           &.el-menu--collapse {
             .el-submenu {
               .el-menu {
-                background-color: #FFF;
+                background-color: transparent;
               }
             }
             .el-submenu__title {
@@ -108,15 +106,15 @@ $color: #409EFF;
           }
           .el-menu-item {
             &:focus {
-              background-color: $color-bg;
+              background-color: rgba(#000, .05);
             }
             &:hover {
-              background-color: $color-bg;
+              background-color: rgba(#000, .05);
             }
           }
           .el-submenu__title {
             &:hover {
-              background-color: $color-bg;
+              background-color: rgba(#000, .05);
             }
           }
         }
diff --git a/src/components/core/CardFull/index.vue b/src/components/core/CardFull/index.vue
index 20ba0beb..76cf9ea6 100644
--- a/src/components/core/CardFull/index.vue
+++ b/src/components/core/CardFull/index.vue
@@ -68,10 +68,14 @@ export default {
 
 
 <style lang="scss" scoped>
+$border-color: #d8dfea;
 .dd-card-full {
   position: absolute;
-  border-radius: 4px;
-  border: 1px solid #ebeef5;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-top: 1px solid $border-color;
+  border-left: 1px solid $border-color;
+  border-right: 1px solid $border-color;
   background-color: #fff;
   overflow: hidden;
   color: #303133;
@@ -84,7 +88,7 @@ export default {
     left: 0px;
     width: 100%;
     padding: 18px 20px;
-    border-bottom: 1px solid #ebeef5;
+    border-bottom: 1px solid $border-color;
     box-sizing: border-box;
   }
   .dd-card-full__body {
@@ -101,7 +105,7 @@ export default {
     left: 0px;
     width: 100%;
     padding: 18px 20px;
-    border-top: 1px solid #ebeef5;
+    border-top: 1px solid $border-color;
     box-sizing: border-box;
   }
 }
diff --git a/src/components/core/Container/index.vue b/src/components/core/Container/index.vue
index 8d02c477..1c19a0b0 100644
--- a/src/components/core/Container/index.vue
+++ b/src/components/core/Container/index.vue
@@ -11,7 +11,7 @@
       <slot></slot>
     </div>
     <!-- [card-full] 撑满 -->
-    <card-full v-if="type === 'card-full'" :right="20" :bottom="20">
+    <card-full v-if="type === 'card-full'" :right="10" :bottom="0">
       <slot v-if="$slots.header" name="header" slot="header"></slot>
       <slot></slot>
       <slot v-if="$slots.footer" name="footer" slot="footer"></slot>
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 237c3dee..5b5657f7 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -33,7 +33,7 @@ export default {
   },
   data () {
     return {
-      theme: 'default',
+      theme: 'classic',
       collapse: false
     }
   },
@@ -59,6 +59,6 @@ export default {
 
 <style lang="scss">
 // 主题
-@import '~@/assets/style/theme/default.scss';
+@import '~@/assets/style/theme/classic.scss';
 </style>
 
diff --git a/src/pages/demo/plugins/clipboard-polyfill/demo.vue b/src/pages/demo/plugins/clipboard-polyfill/demo.vue
index 1f7b8f1e..ade3866a 100644
--- a/src/pages/demo/plugins/clipboard-polyfill/demo.vue
+++ b/src/pages/demo/plugins/clipboard-polyfill/demo.vue
@@ -58,7 +58,8 @@ export default {
           message: '读取成功 返回结果请查看控制台',
           type: 'success'
         })
-      }, (err) => {
+      }, err => {
+        console.log(err)
         this.$message({
           message: '错误信息已经打印到控制台',
           type: 'error'