From f01ee5251293dd67bbd332554329a048753a9b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 4 May 2022 16:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B7=B1=E8=89=B2=E4=B8=BB?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/black.scss | 35 +++++++++++--------------
src/assets/styles/sidebar.scss | 8 ------
src/assets/styles/variables.module.scss | 5 ----
src/components/Notice/Index.vue | 3 +++
src/views/dashboard/PanelGroup.vue | 5 ++--
src/views/index_v1.vue | 15 ++++++-----
6 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/src/assets/styles/black.scss b/src/assets/styles/black.scss
index 7e1628b..c27553b 100644
--- a/src/assets/styles/black.scss
+++ b/src/assets/styles/black.scss
@@ -1,6 +1,7 @@
// 黑夜模式
[data-theme='theme-black'] {
--base-color: #304156;
+ --base-color-rgba: rgba(48, 65, 86, 0.3);
// root
--base-menu-color: var(--base-color);
--base-menu-color-active: #f4f4f5;
@@ -9,12 +10,8 @@
--base-logo-title-color: #ffffff;
--base-topBar-background: var(--base-color) !important;
--base-topBar-color: #fff;
- // --base-tags-bg-border: #304156 !important;
- //缩小状态下子菜单选中颜色
- // --base-sub-menu-hover: #000;
- --next-color-white: #ffffff;
- --next-color-disabled: #304156;
+ --base-color-white: #ffffff;
--next-color-bar: #dadada;
--next-border-color: #424242;
--next-border-black: #333333;
@@ -28,7 +25,7 @@
--el-fill-color-blank: var(--base-bg-main) !important;
// element plus
--el-table-bg-color: var(--el-fill-color-blank);
- --el-color-white: var(--next-color-disabled) !important;
+ --el-color-white: var(--base-color) !important;
--el-text-color-primary: var(--next-color-bar) !important;
--el-border-color-base: var(--next-border-black) !important;
--el-border-color-light: var(--next-border-black) !important;
@@ -42,30 +39,24 @@
--el-text-color-disabled-base: var(--el-color-primary) !important;
--el-border-color-lighter: var(--next-border-black) !important;
--el-text-color-placeholder: var(--next-text-color-placeholder) !important;
- --el-disabled-bg-color: var(--next-color-disabled) !important;
- --el-fill-base: var(--next-color-white) !important;
+ --el-disabled-bg-color: var(--base-color) !important;
+ --el-fill-base: var(--base-color-white) !important;
// el-date-picker bg
--el-bg-color-overlay: var(--base-bg-main) !important;
// drawer
.drawer-item,
.drawer-title {
- color: var(--next-color-white) !important;
+ color: var(--base-color-white) !important;
}
- // button
- .el-button {
- &:hover {
- border-color: var(--next-border-color) !important;
- }
- }
.el-button--primary,
.el-button--info,
.el-button--danger,
.el-button--success,
.el-button--warning {
- --el-button-text-color: var(--next-color-white) !important;
- --el-button-hover-text-color: var(--next-color-white) !important;
- --el-button-disabled-text-color: var(--next-color-white) !important;
+ --el-button-text-color: var(--base-color-white) !important;
+ --el-button-hover-text-color: var(--base-color-white) !important;
+ --el-button-disabled-text-color: var(--base-color-white) !important;
&:hover {
border-color: var(--el-button-hover-border-color, var(--el-button-hover-bg-color)) !important;
}
@@ -73,7 +64,7 @@
// pagination
.el-pagination.is-background .el-pager li:not(.disabled).active {
- color: var(--next-color-white) !important;
+ color: var(--base-color-white) !important;
}
.el-pagination.is-background .btn-next,
.el-pagination.is-background .btn-prev,
@@ -96,7 +87,7 @@
.el-alert,
.notice-bar {
border: 1px solid var(--next-border-color) !important;
- background-color: var(--next-color-disabled) !important;
+ background-color: var(--base-color) !important;
}
// colorPicker
@@ -141,5 +132,9 @@
.el-upload--picture-card,
.el-image__error {
background: none !important;
+ }
+ //el table loading mask
+ .el-loading-mask {
+ background-color: var(--base-color-rgba) !important;
}
}
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index ba06056..9f00c95 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -90,14 +90,6 @@
// when menu collapsed
.el-menu--vertical {
- .nest-menu .el-sub-menu > .el-sub-menu__title,
- .el-menu-item {
- &:hover {
- // 缩小状态下选中背景
- // background-color: var(--base-sub-menu-hover) !important;
- }
- }
-
// the scroll bar appears when the subMenu is too long
> .el-menu--popup {
max-height: 100vh;
diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index 6a22c19..421bb6e 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -31,8 +31,6 @@ $panGreen: #30b08f;
// 顶部导航栏背景色
--base-topBar-background: #ffffff;
- //缩小状态下子菜单选中颜色
- --base-sub-menu-hover: #ccc;
}
/***深色主题颜色配置***/
[data-theme='theme-dark'] {
@@ -42,9 +40,6 @@ $panGreen: #30b08f;
--base-logo-title-color: #ffffff;
--base-topBar-background: #ffffff;
- //缩小状态下子菜单选中颜色
- --base-sub-menu-hover: #000;
-
// el-ement ui 设置
--el-fill-color-blank: #304156;
--el-text-color-primary: #bfcbd9;
diff --git a/src/components/Notice/Index.vue b/src/components/Notice/Index.vue
index 0aa92ff..9d94af1 100644
--- a/src/components/Notice/Index.vue
+++ b/src/components/Notice/Index.vue
@@ -115,4 +115,7 @@ function onGoToGiteeClick() {
:deep(.el-empty__description p) {
font-size: 13px;
}
+.head-box-title{
+ color: var(--base-color-white);
+}
diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index 94fb674..8d3c38e 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -86,7 +86,7 @@ function handleSetLineChartData(type) {
position: relative;
overflow: hidden;
color: #666;
- background: #fff;
+ background: var(--base-bg-main);
box-shadow: 4px 4px 40px rgba(0, 0, 0, 0.05);
border-color: rgba(0, 0, 0, 0.05);
@@ -149,13 +149,14 @@ function handleSetLineChartData(type) {
.card-panel-text {
line-height: 18px;
- color: rgba(0, 0, 0, 0.45);
+ color: var(--base-color-white);
font-size: 16px;
margin-bottom: 12px;
}
.card-panel-num {
font-size: 20px;
+ color: var(--base-color-white);
}
}
}
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index 4f273d5..0b32187 100644
--- a/src/views/index_v1.vue
+++ b/src/views/index_v1.vue
@@ -84,8 +84,12 @@
-
-
+
+
+
+
+
+
@@ -116,7 +120,6 @@ import PieChart from './dashboard/PieChart'
import BarChart from './dashboard/BarChart'
import { Vue3SeamlessScroll } from 'vue3-seamless-scroll'
import { listNewArticle } from '@/api/system/article.js'
-import { computed, getCurrentInstance, reactive } from 'vue'
const data = {
newVisitis: {
@@ -160,7 +163,7 @@ function onOpenGitee() {}