From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/assets/style/style.scss | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index 754466b..a553c72 100644
--- a/admin/src/assets/style/style.scss
+++ b/admin/src/assets/style/style.scss
@@ -122,6 +122,12 @@
.status-red{
color:red;
}
+.status-yellow{
+ color: orange;
+}
+.status-grey{
+ color:#999;
+}
.tip-warn {
margin: 4px 0 25px 0;
font-size: 12px;
@@ -138,8 +144,10 @@
.main_app {
background-color: #fff;
- padding: 30px;
- margin: 0 16px;
+ margin-top: 10px;
+ margin-left: 16px;
+ padding: 20px;
+ height: calc(100% - 10px);
}
.fs12{
font-size: 12px;
@@ -232,9 +240,14 @@
.mr20 {
margin-right: 20px;
}
-
+.pt16{
+ padding-top: 16px;
+}
.mb20 {
margin-bottom: 20px;
+}
+.mb40 {
+ margin-bottom: 40px;
}
.red{
color: red !important;
@@ -288,6 +301,11 @@
.df{
display: flex;
}
+.df_center{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
.df_ac{
display: flex;
align-items: center;
--
Gitblit v1.9.3