From 69c0b966deb860179641dbd1af76d901e9973b94 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 28 Jun 2018 18:13:08 +0800
Subject: [PATCH] no message

Former-commit-id: 73401cfaac3d824f6fa21d32ce8f900566860f97 [formerly 73401cfaac3d824f6fa21d32ce8f900566860f97 [formerly 73401cfaac3d824f6fa21d32ce8f900566860f97 [formerly 73401cfaac3d824f6fa21d32ce8f900566860f97 [formerly ad806fa71cdabb219be0facf616280e3b6917334 [formerly 37ab44ef50a33d7fa381dba5bd89aacd8fffe946]]]]]
Former-commit-id: 6f52f06b47e7f664de1a38eb9a4bc2d4c6295188
Former-commit-id: c4b9f387fed0c9dea7382b53f22f4a658cc2d063
Former-commit-id: 351830ce96c02c7429ae3b2075afa95dd6194644 [formerly c5c3f3f99df2e8df36390d1b28095d3dfd910a6c]
Former-commit-id: fd41e4bf6cb352a352a7b665c229974417edba1e
Former-commit-id: 3ad4bb0aa9be693ad4eb88f412ce68210e3390b0
Former-commit-id: 12e4001f70c2f53fe1ea3dfa4f2b7c95e8791d12
Former-commit-id: 066e47119a4209b41d6684f56ad176d71ee2b9f7
Former-commit-id: 5eea14bd5f775d838e4ba9b0e5d6756c5b5706dc
---
 src/assets/style/theme/d2/setting.scss              |  9 +++++++--
 src/assets/style/theme/line/setting.scss            |  9 +++++++--
 src/assets/style/theme/star/setting.scss            | 13 +++++++++----
 src/assets/style/theme/theme.scss.REMOVED.git-id    |  2 +-
 .../style/theme/tomorrow-night-blue/setting.scss    | 11 ++++++++---
 src/assets/style/theme/violet/setting.scss          | 11 ++++++++---
 6 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index 4229d415..02ad7570 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -7,10 +7,15 @@ $theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, 1);
-$theme-container-header-footer-background-color: rgba(#FFF, .6);
+$theme-container-header-footer-background-color: #F7FAFC;
 $theme-container-border-inner: 1px solid #cfd7e5;
 $theme-container-border-outer: 1px solid #cfd7e5;
-$theme-multiple-page-control-border-color: red;
+$theme-multiple-page-control-color: $color-text-normal;
+$theme-multiple-page-control-color-active: #2f74ff;
+$theme-multiple-page-control-border-color: #cfd7e5;
+$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color: #cfd7e5;
+$theme-multiple-page-control-background-color-active: #F7FAFC;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss
index 01339649..b8bf8a74 100644
--- a/src/assets/style/theme/line/setting.scss
+++ b/src/assets/style/theme/line/setting.scss
@@ -7,10 +7,15 @@ $theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, .8);
-$theme-container-header-footer-background-color: rgba(#FFF, .6);
+$theme-container-header-footer-background-color: #F7FAFC;
 $theme-container-border-inner: 1px solid $color-border-2;
 $theme-container-border-outer: 1px solid $color-border-1;
-$theme-multiple-page-control-border-color: red;
+$theme-multiple-page-control-color: #FFF;
+$theme-multiple-page-control-color-active: $color-text-normal;
+$theme-multiple-page-control-border-color: #cfd7e5;
+$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color: #cfd7e5;
+$theme-multiple-page-control-background-color-active: #F7FAFC;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index 1460e745..ee55c2b9 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -7,10 +7,15 @@ $theme-bg-mask: rgba(#000, .3);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, .9);
-$theme-container-header-footer-background-color: rgba(#FFF, .94);
-$theme-container-border-inner: 1px solid #cecece;
-$theme-container-border-outer: 1px solid #EFF4F8;
-$theme-multiple-page-control-border-color: red;
+$theme-container-header-footer-background-color: #F7FAFC;
+$theme-container-border-inner: 1px solid #114450;
+$theme-container-border-outer: 1px solid #114450;
+$theme-multiple-page-control-color: #FFF;
+$theme-multiple-page-control-color-active: $color-text-normal;
+$theme-multiple-page-control-border-color: #114450;
+$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color: rgba(#FFF, .5);
+$theme-multiple-page-control-background-color-active: #F7FAFC;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id
index d095095f..a27e4671 100644
--- a/src/assets/style/theme/theme.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme.scss.REMOVED.git-id
@@ -1 +1 @@
-2bd69553ab4815bc559bb755562ee04eb67b1c20
\ No newline at end of file
+3fd0d098a5ee6b4dc08df5cbf5c22be416b17c43
\ No newline at end of file
diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss
index 9b94b7dc..0937327c 100644
--- a/src/assets/style/theme/tomorrow-night-blue/setting.scss
+++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss
@@ -6,11 +6,16 @@ $theme-bg-color: #002253;
 $theme-bg-mask: rgba(#000, 0);
 
 // container组件
-$theme-container-background-color: #FFF;
-$theme-container-header-footer-background-color: #FFF;
+$theme-container-background-color: rgba(#FFF, 1);
+$theme-container-header-footer-background-color: #F7FAFC;
 $theme-container-border-inner: 1px solid #002253;
 $theme-container-border-outer: 1px solid #002253;
-$theme-multiple-page-control-border-color: red;
+$theme-multiple-page-control-color: #FFF;
+$theme-multiple-page-control-color-active: $color-text-normal;
+$theme-multiple-page-control-border-color: #002253;
+$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color: rgba(#FFF, .5);
+$theme-multiple-page-control-background-color-active: #F7FAFC;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;
diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss
index 1ef721d9..99b79a95 100644
--- a/src/assets/style/theme/violet/setting.scss
+++ b/src/assets/style/theme/violet/setting.scss
@@ -7,10 +7,15 @@ $theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: #FFF;
-$theme-container-header-footer-background-color: rgba(#FFF, .94);
+$theme-container-header-footer-background-color: #F7FAFC;
 $theme-container-border-inner: 1px solid $color-border-2;
-$theme-container-border-outer: none;
-$theme-multiple-page-control-border-color: red;
+$theme-container-border-outer: 1px solid #8C40E2;
+$theme-multiple-page-control-color: #FFF;
+$theme-multiple-page-control-color-active: $color-text-normal;
+$theme-multiple-page-control-border-color: #8C40E2;
+$theme-multiple-page-control-border-color-active: #F7FAFC;
+$theme-multiple-page-control-background-color: rgba(#FFF, .3);
+$theme-multiple-page-control-background-color-active: #F7FAFC;
 
 // 顶栏和侧边栏中展开的菜单 hover 状态下
 $theme-menu-item-color-hover: #293849;