From 9070be6f7d0fbf4ba492dd0efecc4f0475d21522 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 28 Jun 2018 17:04:59 +0800 Subject: [PATCH] no message Former-commit-id: 46e7f2a678d857c84707640d30667a864cf4dac8 [formerly 46e7f2a678d857c84707640d30667a864cf4dac8 [formerly 46e7f2a678d857c84707640d30667a864cf4dac8 [formerly 46e7f2a678d857c84707640d30667a864cf4dac8 [formerly 7a8f7d832d2bdd177ad5db200dc3c93b4f8e7769 [formerly 7b3a6dda5482f30a3fca0d684d018c1981645629]]]]] Former-commit-id: 330b0f2397bec9fd2368db58989b1de6c56b2639 Former-commit-id: a85ab1933dce6588cfbbacdeccd2aea231a8c890 Former-commit-id: 95522edeed77cc73ffa6076f11a6abce49edc747 [formerly f2cf568402022c8f9af7aa582b4bcc09b0a2dc80] Former-commit-id: 70691dfe9c9c950d068b858facd0130c29c03ace Former-commit-id: 8ddcc71978c4a4d7a6cd2a2186201d9b2d43334d Former-commit-id: e9062767bb368681ac4bb576b968dd94991eb637 Former-commit-id: 87291fa60fd8b4b55d24162c2ec41ce7a577bab0 Former-commit-id: 230a6a2f1723c14687b51c098d1755efb7ad4ed0 --- src/assets/style/theme/d2/setting.scss | 1 + src/assets/style/theme/line/setting.scss | 1 + src/assets/style/theme/star/setting.scss | 3 ++- src/assets/style/theme/theme.scss.REMOVED.git-id | 2 +- src/assets/style/theme/tomorrow-night-blue/setting.scss | 1 + src/assets/style/theme/violet/setting.scss | 5 +++-- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index b12d73b8..4229d415 100644 --- a/src/assets/style/theme/d2/setting.scss +++ b/src/assets/style/theme/d2/setting.scss @@ -10,6 +10,7 @@ $theme-container-background-color: rgba(#FFF, 1); $theme-container-header-footer-background-color: rgba(#FFF, .6); $theme-container-border-inner: 1px solid #cfd7e5; $theme-container-border-outer: 1px solid #cfd7e5; +$theme-multiple-page-control-border-color: red; // 顶栏和侧边栏中展开的菜单 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 27b05f94..01339649 100644 --- a/src/assets/style/theme/line/setting.scss +++ b/src/assets/style/theme/line/setting.scss @@ -10,6 +10,7 @@ $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; +$theme-multiple-page-control-border-color: red; // 顶栏和侧边栏中展开的菜单 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 0745e12f..1460e745 100644 --- a/src/assets/style/theme/star/setting.scss +++ b/src/assets/style/theme/star/setting.scss @@ -7,9 +7,10 @@ $theme-bg-mask: rgba(#000, .3); // container组件 $theme-container-background-color: rgba(#FFF, .9); -$theme-container-header-footer-background-color: rgba(#FFF, .6); +$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; // 顶栏和侧边栏中展开的菜单 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 7d831a40..d095095f 100644 --- a/src/assets/style/theme/theme.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme.scss.REMOVED.git-id @@ -1 +1 @@ -aeb45ab7fb032fd80db6d0c6a414aa39bd50212b \ No newline at end of file +2bd69553ab4815bc559bb755562ee04eb67b1c20 \ 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 0864448c..9b94b7dc 100644 --- a/src/assets/style/theme/tomorrow-night-blue/setting.scss +++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss @@ -10,6 +10,7 @@ $theme-container-background-color: #FFF; $theme-container-header-footer-background-color: #FFF; $theme-container-border-inner: 1px solid #002253; $theme-container-border-outer: 1px solid #002253; +$theme-multiple-page-control-border-color: red; // 顶栏和侧边栏中展开的菜单 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 4b7c587c..1ef721d9 100644 --- a/src/assets/style/theme/violet/setting.scss +++ b/src/assets/style/theme/violet/setting.scss @@ -6,10 +6,11 @@ $theme-bg-color: #000; $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-background-color: #FFF; +$theme-container-header-footer-background-color: rgba(#FFF, .94); $theme-container-border-inner: 1px solid $color-border-2; $theme-container-border-outer: none; +$theme-multiple-page-control-border-color: red; // 顶栏和侧边栏中展开的菜单 hover 状态下 $theme-menu-item-color-hover: #293849;