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

Former-commit-id: 4c963e6b2ac57585d996b3134c9da48ff3c67cc3 [formerly d814792f640f7852b18b1d5e88b6c696867a12f3] [formerly 4c963e6b2ac57585d996b3134c9da48ff3c67cc3 [formerly d814792f640f7852b18b1d5e88b6c696867a12f3] [formerly 4c963e6b2ac57585d996b3134c9da48ff3c67cc3 [formerly d814792f640f7852b18b1d5e88b6c696867a12f3] [formerly d814792f640f7852b18b1d5e88b6c696867a12f3 [formerly d60eb3d92af6d7aca69d0ae95f44b67f69e7e8ff [formerly 7e812f11ba838173e63c4bbff391365ef12c114d]]]]]
Former-commit-id: 1293be874322a65bea6cf7efb615f9ae73b1af9b
Former-commit-id: 0ee50845ebe6b38731f0dccdb7dd154624206257
Former-commit-id: bab7ae2c943acc69b077e700f55f9b9a16c78259 [formerly 465226c28beddf7b9fcadee5581a05799a5b9b4a]
Former-commit-id: 06413528d609e638694ffc338dbdd3a64db82513
Former-commit-id: 947ef33191cea3f9a413b5d3ffd54827b9808ea2
Former-commit-id: ddd4cc15d2f24aefe4f88740cba54fbbbfec974b
Former-commit-id: 8882f4cccfc06e694cc83f674db9ecb04bfb3a62
Former-commit-id: 5744c15f15117c5fdf4e320ab8bc3f66a92e3b46
---
 src/menu/index.js                            |  3 +-
 src/pages/demo/element/basic-color/index.vue | 72 ++++++++++++++++++++
 src/router/index.js                          |  1 +
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/demo/element/basic-color/index.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index 5d9d7607..f1cce48c 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -134,7 +134,8 @@ const demoElement = {
       title: '基础',
       children: [
         { path: `${pre}basic-layout`, title: '布局' },
-        { path: `${pre}basic-container`, title: '布局容器' }
+        { path: `${pre}basic-container`, title: '布局容器' },
+        { path: `${pre}basic-color`, title: '颜色' }
       ]
     }
   ])('/demo/element/')
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
new file mode 100644
index 00000000..c7f2b77b
--- /dev/null
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -0,0 +1,72 @@
+<template>
+  <d2-container type="ghost">
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">主色</template>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <div class="color color-primary">
+            <!-- <h1>$color-primary</h1> -->
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never" class="d2-mb">
+      <template slot="header">辅助色</template>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <div class="color color-info"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-success"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-warning"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-danger"></div>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card shadow="never">
+      <template slot="header">中性色</template>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <div class="color color-info"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-success"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-warning"></div>
+        </el-col>
+        <el-col :span="6">
+          <div class="color color-danger"></div>
+        </el-col>
+      </el-row>
+    </el-card>
+  </d2-container>
+</template>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/unit/_color.scss';
+.color {
+  border-radius: 4px;
+  height: 100px;
+}
+.color-primary {
+  background-color: $color-primary;
+}
+.color-info {
+  background-color: $color-info;
+}
+.color-success {
+  background-color: $color-success;
+}
+.color-warning {
+  background-color: $color-warning;
+}
+.color-danger {
+  background-color: $color-danger;
+}
+</style>
+
diff --git a/src/router/index.js b/src/router/index.js
index 3ef19f1b..a29d89c0 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -110,6 +110,7 @@ const routes = [
     children: (pre => [
       { path: 'basic-layout', name: `${pre}basic-layout`, component: () => import('@/pages/demo/element/basic-layout/index.vue'), meta },
       { path: 'basic-container', name: `${pre}basic-container`, component: () => import('@/pages/demo/element/basic-container/index.vue'), meta },
+      { path: 'basic-color', name: `${pre}basic-color`, component: () => import('@/pages/demo/element/basic-color/index.vue'), meta },
       { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
     ])('demo-element-')
   },