From 2e0341a897d3322205112576def148640ce67556 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 22:08:09 +0800
Subject: [PATCH 01/11] no message

Former-commit-id: 826547b650af13ea9f8e2e8be4bcfe246161d79f
Former-commit-id: df50252333622a968b4d2e84b5140af3bb0ec790
Former-commit-id: 3efc5fc12b45db4945156bcb21c55fd4e82a6e80
---
 src/pages/demo/plugins/import/csv.vue  | 2 +-
 src/pages/demo/plugins/import/xlsx.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/demo/plugins/import/csv.vue b/src/pages/demo/plugins/import/csv.vue
index aa18de82..2e3bf3ee 100644
--- a/src/pages/demo/plugins/import/csv.vue
+++ b/src/pages/demo/plugins/import/csv.vue
@@ -15,7 +15,7 @@
         </el-button>
       </el-upload>
     </div>
-    <el-table v-bind="table" class="d2-mb">
+    <el-table v-bind="table">
       <el-table-column
         v-for="(item, index) in table.columns"
         :key="index"
diff --git a/src/pages/demo/plugins/import/xlsx.vue b/src/pages/demo/plugins/import/xlsx.vue
index 487b5553..ea55c8c1 100644
--- a/src/pages/demo/plugins/import/xlsx.vue
+++ b/src/pages/demo/plugins/import/xlsx.vue
@@ -15,7 +15,7 @@
         </el-button>
       </el-upload>
     </div>
-    <el-table v-bind="table" class="d2-mb">
+    <el-table v-bind="table">
       <el-table-column
         v-for="(item, index) in table.columns"
         :key="index"

From 52b952cc82d341d5e513eb4c7c3b9e141368201a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 22:10:43 +0800
Subject: [PATCH 02/11] no message

Former-commit-id: 1e8f0cac82ab5f0d95c479328d71980ea25f3e79
Former-commit-id: 97bb3d780d7b0c546492204e6b703733f3d41cb2
Former-commit-id: 28360314e1d5f19ae573c4905c7d005ddee70641
---
 src/pages/demo/chart/demo/components/d2-demo-chart-card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/demo/chart/demo/components/d2-demo-chart-card.vue b/src/pages/demo/chart/demo/components/d2-demo-chart-card.vue
index e9b26f5d..ff692e71 100644
--- a/src/pages/demo/chart/demo/components/d2-demo-chart-card.vue
+++ b/src/pages/demo/chart/demo/components/d2-demo-chart-card.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card>
+  <el-card shadow="never">
     <div slot="header">
       <el-button type="primary" size="mini" @click="syncData">
         <d2-icon name="refresh"/>

From 7e0c1182a339affe31112f22095d5f1f411c1101 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 22:26:29 +0800
Subject: [PATCH 03/11] no message

Former-commit-id: af527fe7b8b689f3564c6e07f16af6250709e895
Former-commit-id: b4770d337e13dbeaf9215e09293b7006df693e67
Former-commit-id: dab7359d32619f32d48aadd091a555ffbf8511dc
---
 src/assets/style/theme/d2/index.scss     | 11 ++++++-----
 src/assets/style/theme/d2/setting.scss   |  3 ++-
 src/assets/style/theme/star/index.scss   | 11 +++++++----
 src/assets/style/theme/star/setting.scss |  3 ++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/assets/style/theme/d2/index.scss b/src/assets/style/theme/d2/index.scss
index cad7dab9..c135eb15 100644
--- a/src/assets/style/theme/d2/index.scss
+++ b/src/assets/style/theme/d2/index.scss
@@ -30,22 +30,23 @@
 
   // [组件] d2-container-full
   .d2-container-full {
-    border: $theme-container-border;
+    border: $theme-container-border-outer;
     border-bottom: none;
     .d2-container-full__header {
-      border-bottom: $theme-container-border;
+      border-bottom: $theme-container-border-inner;
     }
     .d2-container-full__footer {
-      border-top: $theme-container-border;
+      border-top: $theme-container-border-inner;
     }
   }
   // [组件] d2-container-card
   .d2-container-card {
-    border: $theme-container-border;
+    border: $theme-container-border-outer;
     .el-card__header {
-      border-bottom: $theme-container-border;
+      border-bottom: $theme-container-border-inner;
     }
   }
+  
   // 顶栏
   .el-header {
     // 切换按钮
diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index e9ce12b8..0d0a2b3c 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -5,7 +5,8 @@ $theme-bg-color: $color-bg;
 // 主题背景图片
 // $theme-bg-image: '/static/image/bg/xxx.jpg';
 // container组件的边框
-$theme-container-border: 1px solid $color-border-1;
+$theme-container-border-inner: 1px solid $color-border-1;
+$theme-container-border-outer: 1px solid $color-border-1;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index e2221d38..cc521169 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -30,20 +30,23 @@
 
   // [组件] d2-container-full
   .d2-container-full {
+    border: $theme-container-border-outer;
+    border-bottom: none;
     .d2-container-full__header {
-      border-bottom: $theme-container-border;
+      border-bottom: $theme-container-border-inner;
     }
     .d2-container-full__footer {
-      border-top: $theme-container-border;
+      border-top: $theme-container-border-inner;
     }
   }
   // [组件] d2-container-card
   .d2-container-card {
-    border: $theme-container-border;
+    border: $theme-container-border-outer;
     .el-card__header {
-      border-bottom: $theme-container-border;
+      border-bottom: $theme-container-border-inner;
     }
   }
+  
   // 顶栏
   .el-header {
     // 切换按钮
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index 11c9cb77..a2a1f59e 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -5,7 +5,8 @@ $theme-bg-color: #EFF4F8;
 // 主题背景图片
 $theme-bg-image: '/static/image/bg/star.jpg';
 // container组件的边框
-$theme-container-border: 1px solid #d8dfea;
+$theme-container-border-inner: 1px solid #d8dfea;
+$theme-container-border-outer: 1px solid #d8dfea;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;

From c33e7f3c4a68145e36de9decd473e0dfe748c385 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 22:33:32 +0800
Subject: [PATCH 04/11] no message

Former-commit-id: 60505912651ddacc577a71a241cca629061a71f6
Former-commit-id: cdf8bdb5787d66c32b2e1d769c97b83b80fd8ced
Former-commit-id: 1671b0c2f378c6cb4fe9588b477677a5c4abb1d8
---
 src/assets/style/theme/d2/setting.scss   | 2 +-
 src/assets/style/theme/star/setting.scss | 4 ++--
 src/router/index.js                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index 0d0a2b3c..2c1c25d7 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -5,7 +5,7 @@ $theme-bg-color: $color-bg;
 // 主题背景图片
 // $theme-bg-image: '/static/image/bg/xxx.jpg';
 // container组件的边框
-$theme-container-border-inner: 1px solid $color-border-1;
+$theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid $color-border-1;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index a2a1f59e..a9a6cee6 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -5,8 +5,8 @@ $theme-bg-color: #EFF4F8;
 // 主题背景图片
 $theme-bg-image: '/static/image/bg/star.jpg';
 // container组件的边框
-$theme-container-border-inner: 1px solid #d8dfea;
-$theme-container-border-outer: 1px solid #d8dfea;
+$theme-container-border-inner: 1px solid $color-border-2;
+$theme-container-border-outer: none;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/router/index.js b/src/router/index.js
index 8b7f2599..b7909d79 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -28,7 +28,7 @@ const routes = [
     children: (pre => [
       { path: 'container/full', name: `${pre}container-full`, component: () => import('@/pages/demo/components/container/full.vue') },
       { path: 'container/ghost', name: `${pre}container-ghost`, component: () => import('@/pages/demo/components/container/ghost.vue') },
-      { path: 'container/normal', name: `${pre}container-card`, component: () => import('@/pages/demo/components/container/card.vue') },
+      { path: 'container/card', name: `${pre}container-card`, component: () => import('@/pages/demo/components/container/card.vue') },
       { path: 'countup', name: `${pre}countup`, component: () => import('@/pages/demo/components/countup/index.vue') },
       { path: 'editor-quill', name: `${pre}editor-quill`, component: () => import('@/pages/demo/components/editor-quill/index.vue') },
       { path: 'editor-simpleMDE', name: `${pre}editor-simpleMDE`, component: () => import('@/pages/demo/components/editor-simpleMDE/index.vue') },

From b0dfd2f7605a38d7d31d60d09aba20823c4c53db Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 23:41:14 +0800
Subject: [PATCH 05/11] no message

Former-commit-id: 3b7c4afe114d493dc5e3d7b5a402f3644a53aae6
Former-commit-id: 31e98f23a8e1a8332ca8d6987bb4a15bbe79f1d9
Former-commit-id: 024177b8670be44b3a8ef44fb00c0bec9a5a5069
---
 .../image/logo/github-banner.png.REMOVED.git-id       |  1 -
 src/assets/image/logo/header-dev.png.REMOVED.git-id   |  1 -
 src/assets/image/logo/header-test.png.REMOVED.git-id  |  1 -
 src/assets/image/logo/header.png.REMOVED.git-id       |  1 -
 src/assets/image/logo/header@1x.png.REMOVED.git-id    |  1 -
 src/components/core/d2-layout-main/index.vue          | 11 ++++++++---
 src/store/modules/theme.js                            |  4 ++--
 .../d2/preview.png.REMOVED.git-id}                    |  0
 .../star/preview.png.REMOVED.git-id}                  |  0
 9 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 src/assets/image/logo/github-banner.png.REMOVED.git-id
 delete mode 100644 src/assets/image/logo/header-dev.png.REMOVED.git-id
 delete mode 100644 src/assets/image/logo/header-test.png.REMOVED.git-id
 delete mode 100644 src/assets/image/logo/header.png.REMOVED.git-id
 delete mode 100644 src/assets/image/logo/header@1x.png.REMOVED.git-id
 rename static/image/{theme-preview/d2@2x.png.REMOVED.git-id => theme/d2/preview.png.REMOVED.git-id} (100%)
 rename static/image/{theme-preview/star@2x.png.REMOVED.git-id => theme/star/preview.png.REMOVED.git-id} (100%)

diff --git a/src/assets/image/logo/github-banner.png.REMOVED.git-id b/src/assets/image/logo/github-banner.png.REMOVED.git-id
deleted file mode 100644
index 8b778a2b..00000000
--- a/src/assets/image/logo/github-banner.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-d37095e66cfdce9f355275f0b0a92d6ac646c2af
\ No newline at end of file
diff --git a/src/assets/image/logo/header-dev.png.REMOVED.git-id b/src/assets/image/logo/header-dev.png.REMOVED.git-id
deleted file mode 100644
index bc39778b..00000000
--- a/src/assets/image/logo/header-dev.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3fcdead32f4159d2c1a90ce6442632dc64e672a5
\ No newline at end of file
diff --git a/src/assets/image/logo/header-test.png.REMOVED.git-id b/src/assets/image/logo/header-test.png.REMOVED.git-id
deleted file mode 100644
index 25213f59..00000000
--- a/src/assets/image/logo/header-test.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-5d8b6bdb850f8f23d983ed2e18518c7fad31ca00
\ No newline at end of file
diff --git a/src/assets/image/logo/header.png.REMOVED.git-id b/src/assets/image/logo/header.png.REMOVED.git-id
deleted file mode 100644
index e78ecb52..00000000
--- a/src/assets/image/logo/header.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-762198f6b192d9faef94d5eab316518f842f9c88
\ No newline at end of file
diff --git a/src/assets/image/logo/header@1x.png.REMOVED.git-id b/src/assets/image/logo/header@1x.png.REMOVED.git-id
deleted file mode 100644
index e78ecb52..00000000
--- a/src/assets/image/logo/header@1x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-762198f6b192d9faef94d5eab316518f842f9c88
\ No newline at end of file
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 6493b856..3c2b711c 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -3,8 +3,8 @@
     <!-- 顶栏 -->
     <el-header>
       <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-        <img v-if="collapse" src="@/assets/image/logo/header-icon-only.png">
-        <img v-else src="@/assets/image/logo/header.png">
+        <img v-if="collapse" :src="`/static/image/theme/${themeName}/logo/icon-only.png`">
+        <img v-else :src="`/static/image/theme/${themeName}/logo/all.png`">
       </div>
       <div class="toggle-aside-btn" @click="collapse = !collapse">
         <d2-icon name="bars"/>
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { mapMutations } from 'vuex'
+import { mapState, mapMutations } from 'vuex'
 export default {
   name: 'd2-layout-main',
   components: {
@@ -46,6 +46,11 @@ export default {
       asideWidthCollapse: '65px'
     }
   },
+  computed: {
+    ...mapState({
+      themeName: state => state.theme.name
+    })
+  },
   mounted () {
     // 加载主题
     this.loadTheme()
diff --git a/src/store/modules/theme.js b/src/store/modules/theme.js
index 5eae0945..293ecd0e 100644
--- a/src/store/modules/theme.js
+++ b/src/store/modules/theme.js
@@ -6,12 +6,12 @@ export default {
       {
         name: 'd2admin 经典',
         value: 'd2',
-        preview: '/static/image/theme-preview/d2@2x.png'
+        preview: '/static/image/theme/d2/preview.png'
       },
       {
         name: '流星',
         value: 'star',
-        preview: '/static/image/theme-preview/star@2x.png'
+        preview: '/static/image/theme/star/preview.png'
       }
     ],
     name: ''
diff --git a/static/image/theme-preview/d2@2x.png.REMOVED.git-id b/static/image/theme/d2/preview.png.REMOVED.git-id
similarity index 100%
rename from static/image/theme-preview/d2@2x.png.REMOVED.git-id
rename to static/image/theme/d2/preview.png.REMOVED.git-id
diff --git a/static/image/theme-preview/star@2x.png.REMOVED.git-id b/static/image/theme/star/preview.png.REMOVED.git-id
similarity index 100%
rename from static/image/theme-preview/star@2x.png.REMOVED.git-id
rename to static/image/theme/star/preview.png.REMOVED.git-id

From 0edaab517df1641fe00d88f10ac80b5496808f59 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 23:46:47 +0800
Subject: [PATCH 06/11] no message

Former-commit-id: f72b176bc63998fa6b3005dde8747229e85e836f
Former-commit-id: 0d3e1c62ed17d0ec4413edf12d5a891e9a9414c2
Former-commit-id: 88438978349204997f4b05f9ade4217af3dabbb4
---
 src/store/modules/theme.js                                    | 4 ++--
 ...eview.png.REMOVED.git-id => preview@2x.png.REMOVED.git-id} | 0
 static/image/theme/star/preview.png.REMOVED.git-id            | 1 -
 static/image/theme/star/preview@2x.png.REMOVED.git-id         | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename static/image/theme/d2/{preview.png.REMOVED.git-id => preview@2x.png.REMOVED.git-id} (100%)
 delete mode 100644 static/image/theme/star/preview.png.REMOVED.git-id
 create mode 100644 static/image/theme/star/preview@2x.png.REMOVED.git-id

diff --git a/src/store/modules/theme.js b/src/store/modules/theme.js
index 293ecd0e..63e5c4e8 100644
--- a/src/store/modules/theme.js
+++ b/src/store/modules/theme.js
@@ -6,12 +6,12 @@ export default {
       {
         name: 'd2admin 经典',
         value: 'd2',
-        preview: '/static/image/theme/d2/preview.png'
+        preview: '/static/image/theme/d2/preview@2x.png'
       },
       {
         name: '流星',
         value: 'star',
-        preview: '/static/image/theme/star/preview.png'
+        preview: '/static/image/theme/star/preview@2x.png'
       }
     ],
     name: ''
diff --git a/static/image/theme/d2/preview.png.REMOVED.git-id b/static/image/theme/d2/preview@2x.png.REMOVED.git-id
similarity index 100%
rename from static/image/theme/d2/preview.png.REMOVED.git-id
rename to static/image/theme/d2/preview@2x.png.REMOVED.git-id
diff --git a/static/image/theme/star/preview.png.REMOVED.git-id b/static/image/theme/star/preview.png.REMOVED.git-id
deleted file mode 100644
index e6110816..00000000
--- a/static/image/theme/star/preview.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-a2ed3f2203f8040f54c623f3b0d07ee16277d514
\ No newline at end of file
diff --git a/static/image/theme/star/preview@2x.png.REMOVED.git-id b/static/image/theme/star/preview@2x.png.REMOVED.git-id
new file mode 100644
index 00000000..52e63607
--- /dev/null
+++ b/static/image/theme/star/preview@2x.png.REMOVED.git-id
@@ -0,0 +1 @@
+63b120219f5efcbbcbe0766a862cbeeb0f670fff
\ No newline at end of file

From 65be076b27ead3ca27e17e8fe1a66f191a63e14e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 11 Jun 2018 23:48:09 +0800
Subject: [PATCH 07/11] no message

Former-commit-id: afd22f99043d01265df197c185e9504abe1bfae5
Former-commit-id: 0cd26f4002ccaa71f89215c609630320e9adaabf
Former-commit-id: e3206cb031e25e78f4419026537843bab13257c8

From 0a640f3a18811dd9074e64d137374f23ac2074eb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 00:08:48 +0800
Subject: [PATCH 08/11] no message

Former-commit-id: f15181110a6aabe756ed7f711300b192c79293c8
Former-commit-id: 6be9466105e3c289072e3a0db5b1e3f0546d8714
Former-commit-id: a0c01f525426116840ad39a7f130b5f77ebefbc4
Former-commit-id: ad062fd56a932e7ebe644626f966348b53246641
---
 src/assets/style/theme/line/index.scss        | 157 ++++++++++++++++++
 src/assets/style/theme/line/setting.scss      |  39 +++++
 src/assets/style/theme/star/setting.scss      |   2 +-
 src/components/core/d2-layout-main/index.vue  |   1 +
 src/store/modules/theme.js                    |   5 +
 static/image/bg/bg.psd.REMOVED.git-id         |   1 +
 .../image/bg/line-squashed.jpg.REMOVED.git-id |   1 +
 .../image/bg/star-squashed.jpg.REMOVED.git-id |   1 +
 static/image/bg/star.jpg.REMOVED.git-id       |   1 -
 .../theme/line/preview@2x.png.REMOVED.git-id  |   1 +
 10 files changed, 207 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/style/theme/line/index.scss
 create mode 100644 src/assets/style/theme/line/setting.scss
 create mode 100644 static/image/bg/bg.psd.REMOVED.git-id
 create mode 100644 static/image/bg/line-squashed.jpg.REMOVED.git-id
 create mode 100644 static/image/bg/star-squashed.jpg.REMOVED.git-id
 delete mode 100644 static/image/bg/star.jpg.REMOVED.git-id
 create mode 100644 static/image/theme/line/preview@2x.png.REMOVED.git-id

diff --git a/src/assets/style/theme/line/index.scss b/src/assets/style/theme/line/index.scss
new file mode 100644
index 00000000..cc521169
--- /dev/null
+++ b/src/assets/style/theme/line/index.scss
@@ -0,0 +1,157 @@
+@import '../theme.scss';
+@import './setting.scss';
+
+.theme-#{$theme-name} {
+
+  .layout-main {
+    background-color: $theme-bg-color;
+    background-image: url($theme-bg-image);
+  }
+  // 菜单项目
+  @mixin theme-menu-hover-style {
+    color: $theme-menu-item-color-hover;
+    i {
+      color: $theme-menu-item-color-hover;
+    }
+    background-color: $theme-menu-item-background-color-hover;
+  }
+  .el-submenu__title:hover {
+    @include theme-menu-hover-style;
+  }
+  .el-menu-item:hover {
+    @include theme-menu-hover-style;
+  }
+  .el-menu--horizontal .el-menu-item:not(.is-disabled):hover {
+    @include theme-menu-hover-style;
+  }
+  .el-menu--horizontal .el-menu .el-submenu__title:hover {
+    @include theme-menu-hover-style;
+  }
+
+  // [组件] d2-container-full
+  .d2-container-full {
+    border: $theme-container-border-outer;
+    border-bottom: none;
+    .d2-container-full__header {
+      border-bottom: $theme-container-border-inner;
+    }
+    .d2-container-full__footer {
+      border-top: $theme-container-border-inner;
+    }
+  }
+  // [组件] d2-container-card
+  .d2-container-card {
+    border: $theme-container-border-outer;
+    .el-card__header {
+      border-bottom: $theme-container-border-inner;
+    }
+  }
+  
+  // 顶栏
+  .el-header {
+    // 切换按钮
+    .toggle-aside-btn {
+      i {
+        color: $theme-header-item-color;
+        background-color: $theme-header-item-background-color;
+        &:hover {
+          color: $theme-header-item-color-hover;
+        }
+      }
+    }
+    // 顶栏菜单
+    .el-menu {
+      .el-menu-item {
+        transition: border-top-color 0s;
+        color: $theme-header-item-color;
+        background-color: $theme-header-item-background-color;
+        &:hover {
+          color: $theme-header-item-color-hover;
+          background-color: $theme-header-item-background-color-hover;
+        }
+        &:focus {
+          color: $theme-header-item-color-focus;
+          background-color: $theme-header-item-background-color-focus;
+        }
+        &.is-active {
+          color: $theme-header-item-color-active;
+          background-color: $theme-header-item-background-color-active;
+        }
+      }
+      .el-submenu {
+        .el-submenu__title {
+          transition: border-top-color 0s;
+          color: $theme-header-item-color;
+          background-color: $theme-header-item-background-color;
+          .el-submenu__icon-arrow {
+            color: $theme-header-item-color;
+          }
+          &:hover {
+            color: $theme-header-item-color-hover;
+            background-color: $theme-header-item-background-color-hover;
+          }
+          &:focus {
+            color: $theme-header-item-color-focus;
+            background-color: $theme-header-item-background-color-focus;
+          }
+        }
+      }
+    }
+    // 顶栏右侧
+    .d2-header-right {
+      .btn-text {
+        color: $theme-header-item-color;
+        &.can-hover {
+          &:hover {
+            color: $theme-header-item-color-hover;
+            background-color: $theme-header-item-background-color-hover;
+          }
+        }
+      }
+    }
+  }
+  // [布局] 顶栏下面
+  .el-container {
+    // 侧边栏
+    .el-aside {
+      // [菜单] 正常状态
+      .el-menu {
+        .el-menu-item {
+          color: $theme-aside-item-color;
+          background-color: $theme-aside-item-background-color;
+          i {
+            color: $theme-aside-item-color;
+          }
+          &:hover {
+            color: $theme-aside-item-color-hover;
+            background-color: $theme-aside-item-background-color-hover;
+          }
+          &:focus {
+            color: $theme-aside-item-color-focus;
+            background-color: $theme-aside-item-background-color-focus;
+          }
+          &.is-active {
+            color: $theme-aside-item-color-active;
+            background-color: $theme-aside-item-background-color-active;
+          }
+        }
+      }
+      .el-submenu {
+        .el-submenu__title {
+          color: $theme-aside-item-color;
+          background-color: $theme-aside-item-background-color;
+          i {
+            color: $theme-aside-item-color;
+          }
+          .el-submenu__icon-arrow {
+            color: $theme-aside-item-color;
+          }
+          &:hover {
+            color: $theme-aside-item-color-hover;
+            background-color: $theme-aside-item-background-color-hover;
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss
new file mode 100644
index 00000000..a069c5e9
--- /dev/null
+++ b/src/assets/style/theme/line/setting.scss
@@ -0,0 +1,39 @@
+// 主题名称
+$theme-name: 'line';
+// 主题背景颜色
+$theme-bg-color: $color-bg;
+// 主题背景图片
+$theme-bg-image: '/static/image/bg/line-squashed.jpg';
+// container组件的边框
+$theme-container-border-inner: 1px solid $color-border-2;
+$theme-container-border-outer: 1px solid $color-border-1;
+
+// 顶栏和侧边栏中展开的菜单 hover 状态下
+$theme-menu-item-color-hover: #293849;
+$theme-menu-item-background-color-hover: #ecf5ff;
+
+// 顶栏上的文字颜色
+$theme-header-item-color: $color-text-normal;
+$theme-header-item-background-color: transparent;
+// 顶栏上的项目在 hover 时
+$theme-header-item-color-hover: $color-text-main;
+$theme-header-item-background-color-hover: rgba(#000, .02);
+// 顶栏上的项目在 focus 时
+$theme-header-item-color-focus: $color-text-main;
+$theme-header-item-background-color-focus: rgba(#000, .02);
+// 顶栏上的项目在 active 时
+$theme-header-item-color-active: $color-text-main;
+$theme-header-item-background-color-active: rgba(#000, .03);
+
+// 侧边栏上的文字颜色
+$theme-aside-item-color: $color-text-normal;
+$theme-aside-item-background-color: transparent;
+// 侧边栏上的项目在 hover 时
+$theme-aside-item-color-hover: $color-text-main;
+$theme-aside-item-background-color-hover: rgba(#000, .02);
+// 侧边栏上的项目在 focus 时
+$theme-aside-item-color-focus: $color-text-main;
+$theme-aside-item-background-color-focus: rgba(#000, .02);
+// 侧边栏上的项目在 active 时
+$theme-aside-item-color-active: $color-text-main;
+$theme-aside-item-background-color-active: rgba(#000, .03);
\ No newline at end of file
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index a9a6cee6..87898e6a 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -3,7 +3,7 @@ $theme-name: 'star';
 // 主题背景颜色
 $theme-bg-color: #EFF4F8;
 // 主题背景图片
-$theme-bg-image: '/static/image/bg/star.jpg';
+$theme-bg-image: '/static/image/bg/star-squashed.jpg';
 // container组件的边框
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: none;
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 3c2b711c..69a5aead 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -66,5 +66,6 @@ export default {
 <style lang="scss">
 // 主题
 @import '~@/assets/style/theme/d2/index.scss';
+@import '~@/assets/style/theme/line/index.scss';
 @import '~@/assets/style/theme/star/index.scss';
 </style>
diff --git a/src/store/modules/theme.js b/src/store/modules/theme.js
index 63e5c4e8..fd720184 100644
--- a/src/store/modules/theme.js
+++ b/src/store/modules/theme.js
@@ -8,6 +8,11 @@ export default {
         value: 'd2',
         preview: '/static/image/theme/d2/preview@2x.png'
       },
+      {
+        name: '简约线条',
+        value: 'line',
+        preview: '/static/image/theme/line/preview@2x.png'
+      },
       {
         name: '流星',
         value: 'star',
diff --git a/static/image/bg/bg.psd.REMOVED.git-id b/static/image/bg/bg.psd.REMOVED.git-id
new file mode 100644
index 00000000..5c1e5e22
--- /dev/null
+++ b/static/image/bg/bg.psd.REMOVED.git-id
@@ -0,0 +1 @@
+24e8df57cba3d9d4638a7979543e43ffa3a5a6ee
\ No newline at end of file
diff --git a/static/image/bg/line-squashed.jpg.REMOVED.git-id b/static/image/bg/line-squashed.jpg.REMOVED.git-id
new file mode 100644
index 00000000..22b3d28d
--- /dev/null
+++ b/static/image/bg/line-squashed.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+4945760143bfdf609d363ea8f87dfd81b8aa7e97
\ No newline at end of file
diff --git a/static/image/bg/star-squashed.jpg.REMOVED.git-id b/static/image/bg/star-squashed.jpg.REMOVED.git-id
new file mode 100644
index 00000000..a92af6df
--- /dev/null
+++ b/static/image/bg/star-squashed.jpg.REMOVED.git-id
@@ -0,0 +1 @@
+2176e399086eda9e0aa2e22640a4b2229d0dd4ba
\ No newline at end of file
diff --git a/static/image/bg/star.jpg.REMOVED.git-id b/static/image/bg/star.jpg.REMOVED.git-id
deleted file mode 100644
index 7ee432a8..00000000
--- a/static/image/bg/star.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-5d5d5cae76bf221fe4df90af31aba1800c621bc3
\ No newline at end of file
diff --git a/static/image/theme/line/preview@2x.png.REMOVED.git-id b/static/image/theme/line/preview@2x.png.REMOVED.git-id
new file mode 100644
index 00000000..5233d23e
--- /dev/null
+++ b/static/image/theme/line/preview@2x.png.REMOVED.git-id
@@ -0,0 +1 @@
+74af9ba85ceeec0b54c5067ed5ee62009ee08153
\ No newline at end of file

From e40186df63a1049171c1ab7b764493f3602f1f76 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 00:16:09 +0800
Subject: [PATCH 09/11] no message

Former-commit-id: 8613c69115dbc3fcd79c2a7851f02f755fa75783
Former-commit-id: 9222274129eea9925bd858e6565b7424bdd24fe0
Former-commit-id: 62030f81314f47b701f3ff65eaa2029a79de1166
Former-commit-id: d6e804937d792cf6bb54be6d3d30e29540dfbccf
---
 static/image/theme/d2/preview@2x.png.REMOVED.git-id   | 2 +-
 static/image/theme/line/preview@2x.png.REMOVED.git-id | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/image/theme/d2/preview@2x.png.REMOVED.git-id b/static/image/theme/d2/preview@2x.png.REMOVED.git-id
index 03df04ce..1b17a4ca 100644
--- a/static/image/theme/d2/preview@2x.png.REMOVED.git-id
+++ b/static/image/theme/d2/preview@2x.png.REMOVED.git-id
@@ -1 +1 @@
-74d02da8079b497b2c221e237eda7a63594b3d85
\ No newline at end of file
+a3c1a12bf369a749925b815cbec60166a874a2bd
\ No newline at end of file
diff --git a/static/image/theme/line/preview@2x.png.REMOVED.git-id b/static/image/theme/line/preview@2x.png.REMOVED.git-id
index 5233d23e..4505a2a5 100644
--- a/static/image/theme/line/preview@2x.png.REMOVED.git-id
+++ b/static/image/theme/line/preview@2x.png.REMOVED.git-id
@@ -1 +1 @@
-74af9ba85ceeec0b54c5067ed5ee62009ee08153
\ No newline at end of file
+04779178ebb86b06fc26fcbcb4bc499deb794c10
\ No newline at end of file

From 4ec60af5f1cd43a0220ae274a994a2368b71e6d2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 00:33:06 +0800
Subject: [PATCH 10/11] no message

Former-commit-id: 20811fed685887b2c85d5ff07a9126bf0b7a14d1
Former-commit-id: a486a8f02d810ea79637600083a0218d504a1135
Former-commit-id: 0c0f0271fa7d9ec23f30675cdc292c9febeeb746
Former-commit-id: 5afcec80315e6d12212154d9dabc523764d63dff
---
 docs/zh/guide/change-log.md              | 3 +++
 src/assets/style/theme/d2/index.scss     | 2 ++
 src/assets/style/theme/d2/setting.scss   | 3 ++-
 src/assets/style/theme/line/index.scss   | 2 ++
 src/assets/style/theme/line/setting.scss | 3 ++-
 src/assets/style/theme/star/index.scss   | 2 ++
 src/assets/style/theme/star/setting.scss | 5 +++--
 src/assets/style/theme/theme.scss        | 1 -
 8 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index e5571582..3b623983 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -12,6 +12,9 @@
 * [ 修改 ] 所有类似 `dd-` 的样式前缀(包括自动注册图标的id前缀)统一改为 `d2-`
 * [ 修复 ] 修复 `highlight` 组件和 `markdown` 组件的样式冲突
 * [ 修改 ] 内置组件名称统一改为 `d2-` 前缀，统一使用横线连接 (kebab-case) 风格
+* [ 修改 ] 顶栏 logo 阴影删除
+* [ 新增 ] 主题系统
+* [ 新增 ] 三个主题，分别为 `d2admin 经典`，`简约线条`，`流星`
 
 ## v1.0.0
 
diff --git a/src/assets/style/theme/d2/index.scss b/src/assets/style/theme/d2/index.scss
index c135eb15..aae39c6a 100644
--- a/src/assets/style/theme/d2/index.scss
+++ b/src/assets/style/theme/d2/index.scss
@@ -32,6 +32,7 @@
   .d2-container-full {
     border: $theme-container-border-outer;
     border-bottom: none;
+    background-color: $theme-container-background-color;
     .d2-container-full__header {
       border-bottom: $theme-container-border-inner;
     }
@@ -42,6 +43,7 @@
   // [组件] d2-container-card
   .d2-container-card {
     border: $theme-container-border-outer;
+    background-color: $theme-container-background-color;
     .el-card__header {
       border-bottom: $theme-container-border-inner;
     }
diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index 2c1c25d7..c601388f 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -4,7 +4,8 @@ $theme-name: 'd2';
 $theme-bg-color: $color-bg;
 // 主题背景图片
 // $theme-bg-image: '/static/image/bg/xxx.jpg';
-// container组件的边框
+// container组件
+$theme-container-background-color: rgba(#FFF, 1);
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid $color-border-1;
 
diff --git a/src/assets/style/theme/line/index.scss b/src/assets/style/theme/line/index.scss
index cc521169..fe1cd625 100644
--- a/src/assets/style/theme/line/index.scss
+++ b/src/assets/style/theme/line/index.scss
@@ -32,6 +32,7 @@
   .d2-container-full {
     border: $theme-container-border-outer;
     border-bottom: none;
+    background-color: $theme-container-background-color;
     .d2-container-full__header {
       border-bottom: $theme-container-border-inner;
     }
@@ -42,6 +43,7 @@
   // [组件] d2-container-card
   .d2-container-card {
     border: $theme-container-border-outer;
+    background-color: $theme-container-background-color;
     .el-card__header {
       border-bottom: $theme-container-border-inner;
     }
diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss
index a069c5e9..76b77832 100644
--- a/src/assets/style/theme/line/setting.scss
+++ b/src/assets/style/theme/line/setting.scss
@@ -4,7 +4,8 @@ $theme-name: 'line';
 $theme-bg-color: $color-bg;
 // 主题背景图片
 $theme-bg-image: '/static/image/bg/line-squashed.jpg';
-// container组件的边框
+// container组件
+$theme-container-background-color: rgba(#FFF, .8);
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid $color-border-1;
 
diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index cc521169..fe1cd625 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -32,6 +32,7 @@
   .d2-container-full {
     border: $theme-container-border-outer;
     border-bottom: none;
+    background-color: $theme-container-background-color;
     .d2-container-full__header {
       border-bottom: $theme-container-border-inner;
     }
@@ -42,6 +43,7 @@
   // [组件] d2-container-card
   .d2-container-card {
     border: $theme-container-border-outer;
+    background-color: $theme-container-background-color;
     .el-card__header {
       border-bottom: $theme-container-border-inner;
     }
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index 87898e6a..8510f0e9 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -4,8 +4,9 @@ $theme-name: 'star';
 $theme-bg-color: #EFF4F8;
 // 主题背景图片
 $theme-bg-image: '/static/image/bg/star-squashed.jpg';
-// container组件的边框
-$theme-container-border-inner: 1px solid $color-border-2;
+// container组件
+$theme-container-background-color: rgba(#FFF, .9);
+$theme-container-border-inner: 1px solid #8fb0b1;
 $theme-container-border-outer: none;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 70187876..93198426 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -122,7 +122,6 @@
     position: absolute;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
-    background-color: #FFF;
     overflow: hidden;
     color: #303133;
     &:hover {

From e171fbfca5914f16b53e8e50a8e33fc046bbef43 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 00:45:40 +0800
Subject: [PATCH 11/11] no message

Former-commit-id: eb3c3dd8dfec3bd9a88a114af3db44847f1d8643
Former-commit-id: 541fb1af65045b53a5683f99f1ee88f1f3ababb9
Former-commit-id: 6f819bc1ba1fc2836bf2e663bc2e017561915a09
Former-commit-id: b8b9b3b39bf13a8084237eca938127023b363c6e
---
 src/assets/style/theme/d2/index.scss     | 3 +++
 src/assets/style/theme/d2/setting.scss   | 2 ++
 src/assets/style/theme/line/index.scss   | 3 +++
 src/assets/style/theme/line/setting.scss | 2 ++
 src/assets/style/theme/star/index.scss   | 3 +++
 src/assets/style/theme/star/setting.scss | 2 ++
 src/pages/demo/components/icon/svg.vue   | 2 +-
 7 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/assets/style/theme/d2/index.scss b/src/assets/style/theme/d2/index.scss
index aae39c6a..647b4bc6 100644
--- a/src/assets/style/theme/d2/index.scss
+++ b/src/assets/style/theme/d2/index.scss
@@ -35,9 +35,11 @@
     background-color: $theme-container-background-color;
     .d2-container-full__header {
       border-bottom: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
     .d2-container-full__footer {
       border-top: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
   }
   // [组件] d2-container-card
@@ -46,6 +48,7 @@
     background-color: $theme-container-background-color;
     .el-card__header {
       border-bottom: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
   }
   
diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index c601388f..14d9f9be 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -4,8 +4,10 @@ $theme-name: 'd2';
 $theme-bg-color: $color-bg;
 // 主题背景图片
 // $theme-bg-image: '/static/image/bg/xxx.jpg';
+
 // container组件
 $theme-container-background-color: rgba(#FFF, 1);
+$theme-container-header-footer-background-color: rgba(#FFF, .6);
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid $color-border-1;
 
diff --git a/src/assets/style/theme/line/index.scss b/src/assets/style/theme/line/index.scss
index fe1cd625..ff807f84 100644
--- a/src/assets/style/theme/line/index.scss
+++ b/src/assets/style/theme/line/index.scss
@@ -35,9 +35,11 @@
     background-color: $theme-container-background-color;
     .d2-container-full__header {
       border-bottom: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
     .d2-container-full__footer {
       border-top: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
   }
   // [组件] d2-container-card
@@ -46,6 +48,7 @@
     background-color: $theme-container-background-color;
     .el-card__header {
       border-bottom: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
   }
   
diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss
index 76b77832..075996d9 100644
--- a/src/assets/style/theme/line/setting.scss
+++ b/src/assets/style/theme/line/setting.scss
@@ -4,8 +4,10 @@ $theme-name: 'line';
 $theme-bg-color: $color-bg;
 // 主题背景图片
 $theme-bg-image: '/static/image/bg/line-squashed.jpg';
+
 // container组件
 $theme-container-background-color: rgba(#FFF, .8);
+$theme-container-header-footer-background-color: rgba(#FFF, .6);
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid $color-border-1;
 
diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index fe1cd625..ff807f84 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -35,9 +35,11 @@
     background-color: $theme-container-background-color;
     .d2-container-full__header {
       border-bottom: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
     .d2-container-full__footer {
       border-top: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
   }
   // [组件] d2-container-card
@@ -46,6 +48,7 @@
     background-color: $theme-container-background-color;
     .el-card__header {
       border-bottom: $theme-container-border-inner;
+      background-color: $theme-container-header-footer-background-color;
     }
   }
   
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index 8510f0e9..0c16d9f7 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -4,8 +4,10 @@ $theme-name: 'star';
 $theme-bg-color: #EFF4F8;
 // 主题背景图片
 $theme-bg-image: '/static/image/bg/star-squashed.jpg';
+
 // container组件
 $theme-container-background-color: rgba(#FFF, .9);
+$theme-container-header-footer-background-color: rgba(#FFF, .6);
 $theme-container-border-inner: 1px solid #8fb0b1;
 $theme-container-border-outer: none;
 
diff --git a/src/pages/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue
index 321741fa..56b51abe 100644
--- a/src/pages/demo/components/icon/svg.vue
+++ b/src/pages/demo/components/icon/svg.vue
@@ -38,6 +38,6 @@
 .icon-title {
   font-size: 12px;
   margin-top: 10px;
-  color: $color-text-placehoder;
+  color: $color-text-normal;
 }
 </style>