From be842a3e3acd2fc993a39ccc4e860f9cbb38f5ce Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 5 Jul 2022 17:35:05 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E9=A2=9C=E8=89=B2=20?= =?UTF-8?q?(#1862)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf: 修改颜色 * perf: 优化主题 Co-authored-by: ibuler --- src/styles/menu.scss | 2 +- src/styles/sidebar.scss | 2 +- src/styles/themes/chinese_red.scss | 5 ----- .../themes/{default.scss => classic_green.scss} | 5 ----- src/styles/themes/deep_black.scss | 11 +++++++++++ src/styles/themes/tech_blue.scss | 10 ++++++++++ src/styles/variables.scss | 4 +++- 7 files changed, 26 insertions(+), 13 deletions(-) rename src/styles/themes/{default.scss => classic_green.scss} (71%) create mode 100644 src/styles/themes/deep_black.scss create mode 100644 src/styles/themes/tech_blue.scss diff --git a/src/styles/menu.scss b/src/styles/menu.scss index 13ccee755..399aa12a3 100644 --- a/src/styles/menu.scss +++ b/src/styles/menu.scss @@ -37,7 +37,7 @@ } .is-active i.fa { - color: white; + color: $menuActiveText; } .el-submenu .el-menu-item { diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index f351a8f81..b6814d098 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -72,7 +72,7 @@ } .is-active>.el-submenu__title { - color: $subMenuActiveText !important; + color: $menuActiveText !important; } & .nest-menu .el-submenu-sidebar>.el-submenu__title, diff --git a/src/styles/themes/chinese_red.scss b/src/styles/themes/chinese_red.scss index 842c50f14..193ce13be 100644 --- a/src/styles/themes/chinese_red.scss +++ b/src/styles/themes/chinese_red.scss @@ -5,13 +5,8 @@ $--color-info: #f06f06; $--color-warning: #b17b4e; $--color-danger: #122b58; -// Text -$--color-text-primary: #303133; -$--color-text-regular: #606266; - // Menu $menuBg: #b4312b; $menuActiveLeft: #fff1d9; $menuText: #fff1d9; $menuActiveText: white; -$subMenuActiveText: white; diff --git a/src/styles/themes/default.scss b/src/styles/themes/classic_green.scss similarity index 71% rename from src/styles/themes/default.scss rename to src/styles/themes/classic_green.scss index 72016b354..138ff3208 100644 --- a/src/styles/themes/default.scss +++ b/src/styles/themes/classic_green.scss @@ -5,13 +5,8 @@ $--color-info: #23c6c8; $--color-warning: #f8ac59; $--color-danger: #ed5565; -// Text -$--color-text-primary: #303133; -$--color-text-regular: #606266; - // Menu $menuText: #a7b1c2; $menuActiveLeft: $--color-primary; $menuActiveText: white; -$subMenuActiveText: #f4f4f5; $menuBg: #2f4050; diff --git a/src/styles/themes/deep_black.scss b/src/styles/themes/deep_black.scss new file mode 100644 index 000000000..aef5cbbb3 --- /dev/null +++ b/src/styles/themes/deep_black.scss @@ -0,0 +1,11 @@ +$--color-primary: #0576b9; +$--color-success: #2cb57e; +$--color-info: #47bce8; +$--color-warning: #f5bd58; +$--color-danger: #f56e50; + +// Menu +$menuText: #8fa6bf; +$menuActiveLeft: $--color-primary; +$menuActiveText: white; +$menuBg: #121e2d; diff --git a/src/styles/themes/tech_blue.scss b/src/styles/themes/tech_blue.scss new file mode 100644 index 000000000..7614ddda9 --- /dev/null +++ b/src/styles/themes/tech_blue.scss @@ -0,0 +1,10 @@ +$--color-primary: #174779; +$--color-success: #28a745; +$--color-info: #17a2b8; +$--color-warning: #ffc107; +$--color-danger: #dc3545; + +$menuText: #e9ecef; +$menuActiveLeft: white; +$menuActiveText: white; +$menuBg: #174779; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 553f021a5..1de1ce114 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,6 +1,8 @@ -@import "src/styles/themes/chinese_red"; +@import "./themes/chinese_red"; //@import "./themes/default"; +$--color-text-primary: #303133; +$--color-text-regular: #606266; $--color-black: #000000; $--font-size-base: 13px; $--size-base: 13px;