From 5470429a79313630a7ddef601de1d89e7dada754 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 22 五月 2026 09:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev-new_pro_OA
---
src/assets/styles/variables.module.scss | 193 +++++++++++++++++++++++++++++------------------
1 files changed, 118 insertions(+), 75 deletions(-)
diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index 55b3822..461b545 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -8,31 +8,32 @@
$yellow: #fec171;
$panGreen: #30b08f;
-// menu palette
-$menuText: #677287;
-$menuActiveText: #1f7a72;
-$menuBg: #f4f7f4;
-$menuHover: #e7eeea;
+// menu palette - 浣跨敤涓婚鑹�
+$menuText: #5a6478;
+$menuActiveText: #ffffff;
+$menuBg: #f8fafb;
+$menuHover: rgba(var(--el-color-primary-rgb, 13, 148, 136), 0.08);
-// light theme
-$menuLightBg: #f4f7f4;
-$menuLightHover: #e7eeea;
-$menuLightText: #3b4658;
-$menuLightActiveText: #1f7a72;
+// light theme - 浣跨敤涓婚鑹�
+$menuLightBg: #f8fafb;
+$menuLightHover: rgba(var(--el-color-primary-rgb, 13, 148, 136), 0.08);
+$menuLightText: #3d4858;
+$menuLightActiveText: #ffffff;
// layout
$base-sidebar-width: 216px;
+$base-sidebar-collapsed-width: 72px;
$sideBarWidth: 216px;
-// sidebar
-$base-menu-color: #677287;
-$base-menu-color-active: #1f7a72;
-$base-menu-background: #f4f7f4;
-$base-sub-menu-background: #eef3ef;
+// sidebar - 浼樺寲鍚庣殑渚ц竟鏍忛厤鑹�
+$base-menu-color: #5a6478;
+$base-menu-color-active: #0d9488;
+$base-menu-background: #f8fafb;
+$base-sub-menu-background: #f0f5f4;
$base-sub-menu-hover: #ffffff;
-// component
-$--color-primary: #1f7a72;
+// component - 浼樺寲鍚庣殑涓婚鑹�
+$--color-primary: #0d9488;
$--color-success: #67c23a;
$--color-warning: #d89b41;
$--color-danger: #d25b52;
@@ -64,88 +65,130 @@
}
:root {
- --sidebar-bg: #{$menuBg};
- --sidebar-text: #{$menuText};
- --sidebar-muted: #93a0b1;
- --menu-hover: #{$menuHover};
- --menu-active-bg: #dfe9e4;
- --menu-surface: rgba(255, 255, 255, 0.72);
+ --sidebar-width: 216px;
+ --sidebar-collapsed-width: 72px;
+ --topbar-height: 64px;
+ --tagsbar-height: 40px;
+ --content-gap: 16px;
+ --content-radius: 16px;
+ --layout-header-z: 20;
- --app-bg: #eef2ee;
- --app-bg-accent: #dfe8e2;
- --surface-base: #ffffff;
- --surface-soft: #f7faf8;
- --surface-muted: #eff4f1;
- --surface-border: #d8e1db;
- --surface-border-strong: #c9d5ce;
- --text-primary: #21313f;
- --text-secondary: #5f6d7e;
- --text-tertiary: #8a98a8;
- --shadow-sm: 0 10px 30px rgba(31, 49, 38, 0.06);
- --shadow-md: 0 18px 50px rgba(31, 49, 38, 0.1);
- --radius-lg: 24px;
- --radius-md: 18px;
+ --el-color-primary: #2563eb;
+ --el-color-primary-rgb: 37, 99, 235;
+ --el-color-success: #14b8a6;
+ --el-color-warning: #f59e0b;
+ --el-color-danger: #ef4444;
+
+ --sidebar-bg: linear-gradient(180deg, #0e2a4f 0%, #123e69 55%, #0e2a4f 100%);
+ --sidebar-text: rgba(234, 242, 255, 0.82);
+ --sidebar-muted: rgba(234, 242, 255, 0.82);
+ --menu-hover: rgba(147, 197, 253, 0.2);
+ --menu-active-bg: linear-gradient(135deg, #2f80ff 0%, #38bdf8 100%);
+ --menu-active-text: #f8fbff;
+ --menu-surface: linear-gradient(180deg, rgba(13, 43, 79, 0.97) 0%, rgba(8, 28, 52, 0.94) 100%);
+ --menu-active-glow: 0 8px 18px rgba(56, 139, 255, 0.28);
+
+ --app-bg: #f3f7fc;
+ --app-bg-accent: #eef5ff;
+ --surface-base: rgba(255, 255, 255, 0.92);
+ --surface-soft: rgba(255, 255, 255, 0.88);
+ --surface-muted: #f5f9ff;
+ --surface-border: rgba(148, 163, 184, 0.18);
+ --surface-border-strong: rgba(96, 165, 250, 0.34);
+ --text-primary: #1e293b;
+ --text-secondary: #334155;
+ --text-tertiary: #64748b;
+ --shadow-sm: 0 12px 32px rgba(15, 23, 42, 0.06);
+ --shadow-md: 0 20px 42px rgba(15, 23, 42, 0.1);
+ --shadow-menu: 0 16px 36px rgba(8, 27, 58, 0.26);
+ --radius-lg: 20px;
+ --radius-md: 16px;
--radius-sm: 12px;
+ --radius-xs: 10px;
- --navbar-bg: rgba(255, 255, 255, 0.78);
- --navbar-text: #21313f;
- --navbar-hover: rgba(31, 122, 114, 0.08);
+ --navbar-bg: rgba(255, 255, 255, 0.86);
+ --navbar-text: #1f3658;
+ --navbar-hover: rgba(37, 99, 235, 0.08);
--tags-bg: transparent;
- --tags-item-bg: rgba(255, 255, 255, 0.74);
- --tags-item-border: rgba(201, 213, 206, 0.88);
- --tags-item-text: #5f6d7e;
- --tags-item-hover: rgba(31, 122, 114, 0.08);
- --tags-close-hover: rgba(31, 122, 114, 0.18);
+ --tags-item-bg: rgba(255, 255, 255, 0.9);
+ --tags-item-border: rgba(148, 163, 184, 0.22);
+ --tags-item-text: #334155;
+ --tags-item-hover: #f4f8ff;
+ --tags-close-hover: rgba(37, 99, 235, 0.16);
- --splitpanes-default-bg: #ffffff;
+ --accent-primary: #2563eb;
+ --accent-light: #3b82f6;
+ --accent-lighter: #60a5fa;
+
+ --panel-mask: rgba(255, 255, 255, 0.88);
+ --panel-glow: inset 0 1px 0 rgba(255, 255, 255, 0.58);
+ --splitpanes-default-bg: #f3f7fc;
}
html.dark {
- --el-bg-color: #141414;
- --el-bg-color-overlay: #1d1e1f;
- --el-text-color-primary: #ffffff;
- --el-text-color-regular: #d0d0d0;
- --el-border-color: #434343;
- --el-border-color-light: #434343;
+ --el-bg-color: #f8fbff;
+ --el-bg-color-overlay: #f3f7fd;
+ --el-text-color-primary: #1e293b;
+ --el-text-color-regular: #475569;
+ --el-border-color: rgba(148, 163, 184, 0.2);
+ --el-border-color-light: rgba(148, 163, 184, 0.18);
- --sidebar-bg: #141414;
- --sidebar-text: #ffffff;
- --menu-hover: #2d2d2d;
- --menu-active-text: #{$menuActiveText};
+ --sidebar-bg: linear-gradient(180deg, #0e2a4f 0%, #123e69 55%, #0e2a4f 100%);
+ --sidebar-text: rgba(234, 242, 255, 0.82);
+ --sidebar-muted: rgba(234, 242, 255, 0.82);
+ --menu-hover: rgba(147, 197, 253, 0.2);
+ --menu-active-bg: linear-gradient(135deg, #2f80ff 0%, #38bdf8 100%);
+ --menu-active-text: #f8fbff;
+ --menu-surface: linear-gradient(180deg, rgba(13, 43, 79, 0.97) 0%, rgba(8, 28, 52, 0.94) 100%);
- --navbar-bg: #141414;
- --navbar-text: #ffffff;
- --navbar-hover: #141414;
+ --text-primary: #1e293b;
+ --text-secondary: #334155;
+ --text-tertiary: #64748b;
+ --accent-primary: #2563eb;
+ --accent-light: #3b82f6;
- --tags-bg: #141414;
- --tags-item-bg: #1d1e1f;
- --tags-item-border: #303030;
- --tags-item-text: #d0d0d0;
- --tags-item-hover: #2d2d2d;
- --tags-close-hover: #64666a;
+ --navbar-bg: rgba(255, 255, 255, 0.86);
+ --navbar-text: #1f3658;
+ --navbar-hover: rgba(37, 99, 235, 0.08);
- --splitpanes-bg: #141414;
- --splitpanes-border: #303030;
- --splitpanes-splitter-bg: #1d1e1f;
- --splitpanes-splitter-hover-bg: #2d2d2d;
+ --tags-bg: transparent;
+ --tags-item-bg: rgba(255, 255, 255, 0.9);
+ --tags-item-border: rgba(148, 163, 184, 0.22);
+ --tags-item-text: #334155;
+ --tags-item-hover: #f4f8ff;
+ --tags-close-hover: rgba(37, 99, 235, 0.16);
- --blockquote-bg: #1d1e1f;
- --blockquote-border: #303030;
- --blockquote-text: #d0d0d0;
- --cron-border: #303030;
- --splitpanes-default-bg: #141414;
+ --splitpanes-bg: #f3f7fc;
+ --splitpanes-border: rgba(148, 163, 184, 0.22);
+ --splitpanes-splitter-bg: #e7eef8;
+ --splitpanes-splitter-hover-bg: #d9e6f7;
+
+ --blockquote-bg: #f3f7ff;
+ --blockquote-border: rgba(59, 130, 246, 0.36);
+ --blockquote-text: #334155;
+ --cron-border: rgba(148, 163, 184, 0.22);
+ --splitpanes-default-bg: #f3f7fc;
.sidebar-container {
.el-menu-item,
.menu-title {
- color: var(--el-text-color-regular);
+ color: var(--sidebar-text);
+ }
+
+ .el-menu-item.is-active,
+ .el-menu-item.is-active .menu-title {
+ color: var(--menu-active-text) !important;
}
& .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
& .theme-dark .el-sub-menu .el-menu-item {
background-color: var(--el-bg-color) !important;
}
+
+ & .theme-dark .el-sub-menu .el-menu-item.is-active {
+ background-color: var(--menu-active-bg) !important;
+ }
}
.el-menu--horizontal {
--
Gitblit v1.9.3