From ced07f64827ea8a24ae039e7a8068b9826e91cac Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 16:38:07 +0800
Subject: [PATCH] no message

Former-commit-id: 95ba53857ce2605573ccbd0664a8da4f440c98ce [formerly 95ba53857ce2605573ccbd0664a8da4f440c98ce [formerly 95ba53857ce2605573ccbd0664a8da4f440c98ce [formerly 95ba53857ce2605573ccbd0664a8da4f440c98ce [formerly e561c27647d85623d1ecf664156125f4f4c3264c [formerly 97f85687f9f9c30af88b0ef5b2396ce5d5f2dae0]]]]]
Former-commit-id: ae5475b94414dc1fd31325e72b12d4485fe9c656
Former-commit-id: b0a70a39a6475aff6d8ae95eeaae91555c52f4c8
Former-commit-id: 9730cb2e3f1ab5c439c6154fbc2471683332489b [formerly 6921ebdf5b8d85583b06cbc59b090191f585af43]
Former-commit-id: 31908c28490465fd77b990f4837c0c379c6cdc15
Former-commit-id: 8bcd2437c477f842789acdd597f6dc12be234dea
Former-commit-id: 64bbcbb2efb49d5aed8adefd0284e3eca6c81048
Former-commit-id: 87192c97623e612e03599dbc06a922dff00a2dd2
Former-commit-id: a73089881ef10b83ef35cbeceb1a56610f26c6fc
---
 .../element/basic-color/components/info.vue   |  3 ++
 src/pages/demo/element/basic-color/index.vue  | 48 ++++++++++++++-----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/pages/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
index 1f33a070..ae1bc219 100644
--- a/src/pages/demo/element/basic-color/components/info.vue
+++ b/src/pages/demo/element/basic-color/components/info.vue
@@ -35,6 +35,9 @@ export default {
 
 <style lang="scss" scoped>
 .info {
+  &.dark {
+    color: #333;
+  }
   &.light {
     color: #FFF;
   }
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index 03d40bbf..ae6316c1 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -14,16 +14,24 @@
       <template slot="header">辅助色</template>
       <el-row :gutter="20">
         <el-col :span="6">
-          <div class="color color-info"></div>
+          <div class="color color-info">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-success"></div>
+          <div class="color color-success">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-warning"></div>
+          <div class="color color-warning">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-danger"></div>
+          <div class="color color-danger">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
       </el-row>
     </el-card>
@@ -31,30 +39,46 @@
       <template slot="header">中性色</template>
       <el-row :gutter="20" class="d2-mb">
         <el-col :span="6">
-          <div class="color color-text-main"></div>
+          <div class="color color-text-main">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-text-normal"></div>
+          <div class="color color-text-normal">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-text-sub"></div>
+          <div class="color color-text-sub">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-text-placehoder"></div>
+          <div class="color color-text-placehoder">
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="6">
-          <div class="color color-border-1"></div>
+          <div class="color color-border-1">
+            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-border-2"></div>
+          <div class="color color-border-2">
+            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-border-3"></div>
+          <div class="color color-border-3">
+            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
         <el-col :span="6">
-          <div class="color color-border-4"></div>
+          <div class="color color-border-4">
+            <d2-element-basic-color-info theme="dark" name="Blue" sass="$color-primary" color="#409EFF"/>
+          </div>
         </el-col>
       </el-row>
     </el-card>