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] 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 {