+
-
-
diff --git a/src/Layout/components/AppNavbar/components/ToggleSwitch.vue b/src/Layout/components/AppNavbar/components/ToggleSwitch.vue
index 8070b94..9ecdecd 100644
--- a/src/Layout/components/AppNavbar/components/ToggleSwitch.vue
+++ b/src/Layout/components/AppNavbar/components/ToggleSwitch.vue
@@ -35,7 +35,9 @@ function handleToggleSide() {
margin-right: 10px;
&:hover {
- background-color: #e6e6e6;
+ @include useTheme {
+ background-color: getVar('hoverColor');
+ }
}
}
diff --git a/src/Layout/components/AppNavbar/index.vue b/src/Layout/components/AppNavbar/index.vue
index 3706ac1..f54f516 100644
--- a/src/Layout/components/AppNavbar/index.vue
+++ b/src/Layout/components/AppNavbar/index.vue
@@ -23,11 +23,14 @@ import FunctionalArea from './components/FunctionalArea/index.vue'
.topbar-box {
height: 51px;
- border-bottom: 1px solid $--border-color;
margin-bottom: 1px;
display: flex;
align-items: center;
+ @include useTheme {
+ border-bottom: 1px solid getVar('borderColor');
+ }
+
.bread-crumb-box {
flex: 1;
}
diff --git a/src/components/Container.vue b/src/components/Container.vue
index 38dad35..44bc416 100644
--- a/src/components/Container.vue
+++ b/src/components/Container.vue
@@ -17,6 +17,10 @@
min-height: calc(100% - 30px);
padding: 30px 20px 20px 20px;
border-radius: 5px;
- box-shadow: 0 0 5px #eee;
+
+ @include useTheme {
+ background-color: getVar('bgColor');
+ box-shadow: 0 0 5px getVar('shadowColor');
+ }
}
diff --git a/src/router/modules/pages.ts b/src/router/modules/pages.ts
index 689ee51..52bee00 100644
--- a/src/router/modules/pages.ts
+++ b/src/router/modules/pages.ts
@@ -3,7 +3,7 @@ import type { RouteRecordRaw } from 'vue-router'
const route: RouteRecordRaw = {
path: '/manage',
- meta: { title: '页面', icon: 'Document', redirect: '/manage/table' },
+ meta: { title: '业务页面', icon: 'Document', redirect: '/manage/table' },
component: Layout,
children: [
{
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 07f391b..eeb1461 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -11,7 +11,6 @@
html {
height: 100%;
-
@include scrollbar;
}
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index cca41c3..62282f4 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -1,11 +1,19 @@
$themes: (
light: (
+ appMainBgColor: #f1f1f1,
bgColor: #fff,
- textColor: #212121
+ textColor: #212121,
+ shadowColor: #eee,
+ borderColor: #e6e6e6,
+ hoverColor: #e6e6e6,
),
dark: (
+ appMainBgColor: #000,
bgColor: #212121,
- textColor: #fff
+ textColor: #fff,
+ shadowColor: #2e2d2d,
+ borderColor: #424141,
+ hoverColor: #424141,
)
);
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index c15c80c..433ef87 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -6,8 +6,6 @@ $--collapse-width: 64px;
$--theme-color: #7e9cff;
-$--border-color: #e6e6e6;
-
$--font-size: 14px;
// The :export directive is the magic sauce for webpack
@@ -16,7 +14,6 @@ $--font-size: 14px;
menuWidth: $--menu-width;
themeColor: $--theme-color;
collapseWidth: $--collapse-width;
- borderColor: $--border-color;
}
@import './mixin.scss';
--
Gitee
From 7b9c485fd9e2e3732579db7658ef6792d32bc8a3 Mon Sep 17 00:00:00 2001
From: liushengkai
Date: Sat, 13 Apr 2024 18:57:46 +0800
Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=20=E4=B8=BB=E9=A2=98=E9=87=8D?=
=?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/styles/theme.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 62282f4..9d0e5c3 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -5,7 +5,7 @@ $themes: (
textColor: #212121,
shadowColor: #eee,
borderColor: #e6e6e6,
- hoverColor: #e6e6e6,
+ hoverColor: #ecf5ff,
),
dark: (
appMainBgColor: #000,
@@ -13,7 +13,7 @@ $themes: (
textColor: #fff,
shadowColor: #2e2d2d,
borderColor: #424141,
- hoverColor: #424141,
+ hoverColor: #18222c,
)
);
--
Gitee