From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-vue/src/assets/styles/ruoyi.scss | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/zhitan-vue/src/assets/styles/ruoyi.scss b/zhitan-vue/src/assets/styles/ruoyi.scss
index 4479086..029d415 100644
--- a/zhitan-vue/src/assets/styles/ruoyi.scss
+++ b/zhitan-vue/src/assets/styles/ruoyi.scss
@@ -125,7 +125,6 @@
.el-form .el-form-item__label ,.el-form-item__content {
font-family: OPPOSans, OPPOSans;
font-weight: 500;
- font-size: 16px;
color: #ffffff;
}
@@ -143,7 +142,6 @@
.el-input__inner {
font-family: OPPOSans, OPPOSans;
font-weight: 500;
- font-size: 16px;
color: #a7bfeb;
}
@@ -154,8 +152,6 @@
font-family: OPPOSans, OPPOSans;
font-weight: 500;
color: #a7bfeb;
- font-size: 16px;
- // color: #ffffff;
}
// 涓嬫媺姣忔潯
@@ -262,7 +258,7 @@
background-color: transparent !important;
font-family: OPPOSans, OPPOSans;
font-weight: 500;
- font-size: 16px;
+ // font-size: 16px;
color: #ffffff;
.el-table__header-wrapper,
@@ -273,14 +269,11 @@
td {
word-break: break-word;
background-color: #1d3778 !important;
- // color: #515a6e;
+ color: #515a6e;
height: 48px !important;
- // font-size: 13px;
-
border-radius: 0px 0px 0px 0px;
font-family: OPPOSans, OPPOSans;
font-weight: 500;
- font-size: 16px;
color: #ffffff;
border-bottom: none !important;
}
@@ -316,6 +309,10 @@
// tr:hover > td {
// background-color: #141E4A;
// }
+
+ .el-table-fixed-column--left {
+ background-color: #110f2e !important;
+ }
}
}
@@ -397,18 +394,16 @@
// 鏍�
.el-tree {
background: transparent;
- font-family: Inter, Inter;
- font-weight: 500;
- font-size: 16px;
+ font-size: 14px;
color: #ffffff;
.el-tree-node__content {
- height: 50px;
+ height: 48px;
}
.el-tree-node__expand-icon {
color: #3371eb;
- font-size: 18px;
+ font-size: 16px;
}
.el-tree-node:focus>.el-tree-node__content {
@@ -448,6 +443,7 @@
margin-bottom: -1px;
padding: 11px 0px;
font-size: 13px;
+ color: #fff;
}
.pull-right {
@@ -465,7 +461,8 @@
padding: 14px 15px 7px !important;
min-height: 40px;
background: #1a235d;
- border: none;
+ border-bottom: 1px solid #a09f9f;
+ color: #fff;
}
.el-card__body {
@@ -561,6 +558,26 @@
/* 琛ㄦ牸鍙充晶宸ュ叿鏍忔牱寮� */
.top-right-btn {
margin-left: auto;
+ }
+
+ .el-tabs__item {
+ color: #eaeaea;
+ }
+ .el-tabs__item.is-active {
+ color: #409EFF;
+ }
+
+ .el-descriptions__cell {
+ background: transparent;
+ color: #fff !important;
+ }
+ .el-descriptions__body {
+ background-color: transparent;
+ color: #fff;
+ }
+ .el-descriptions__label {
+ color: #fff !important;
+ background-color: #1a235d !important;
}
}
@@ -803,7 +820,7 @@
background-color: transparent !important;
font-family: OPPOSans, OPPOSans;
font-weight: 500;
- font-size: 16px;
+ // font-size: 16px;
color: #ffffff;
.el-table__header-wrapper,
@@ -813,14 +830,11 @@
background-color: #F7F8FA !important;
// color: #515a6e;
height: 48px !important;
- // font-size: 13px;
-
border-radius: 0px 0px 0px 0px;
font-family: OPPOSans, OPPOSans;
font-weight: 500;
- font-size: 16px;
color: #222222;
- border-bottom: none !important;
+ // border-bottom: none !important;
}
}
@@ -855,6 +869,9 @@
// tr:hover > td {
// background-color: #141E4A;
// }
+ .el-table-fixed-column--left {
+ background-color: #fff;
+ }
}
}
@@ -866,7 +883,7 @@
// 琛ㄦ牸搴曢儴鐧界嚎
.el-table__inner-wrapper::before {
- background-color: transparent;
+ // background-color: transparent;
}
/** 琛ㄥ崟甯冨眬 **/
@@ -936,18 +953,16 @@
// 鏍�
.el-tree {
background: transparent;
- font-family: Inter, Inter;
- font-weight: 500;
font-size: 16px;
color: #333333;
.el-tree-node__content {
- height: 50px;
+ height: 48px;
}
.el-tree-node__expand-icon {
color: #393939;
- font-size: 18px;
+ font-size: 16px;
}
.el-tree-node:focus>.el-tree-node__content {
@@ -1003,8 +1018,8 @@
.el-card__header {
padding: 14px 15px 7px !important;
min-height: 40px;
- background: #1a235d;
- border: none;
+ background: transparent;
+ border-bottom: 1px solid #e7eaec;
}
.el-card__body {
--
Gitblit v1.9.3