From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/assets/style/style.scss | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index f7e3036..0be2757 100644
--- a/admin/src/assets/style/style.scss
+++ b/admin/src/assets/style/style.scss
@@ -1,4 +1,5 @@
@import "variables.scss";
+@import "./element-variables.scss";
// 鏍峰紡閲嶇疆
html {
height: 100%;
@@ -113,10 +114,20 @@
font-weight: bold;
}
}
+.status-blue{
+ color: #3C77DA;
+}
+.status-green{
+ color:green;
+}
+.status-red{
+ color:red;
+}
.tip-warn {
- margin: 4px 0 12px 0;
+ margin: 4px 0 25px 0;
font-size: 12px;
color: #999;
+ line-height: 25px;
i {
color: orange;
margin-right: 4px;
@@ -146,7 +157,7 @@
width: 200px !important;
}
.w300{
- width: 300px;
+ width: 300px !important;
}
.w400{
width: 400px !important;
@@ -210,12 +221,33 @@
.mb20 {
margin-bottom: 20px;
}
-
+.red{
+ color: red !important;
+}
+.green{
+ color: #00BA67;
+}
+.primaryColor{
+ color: $primary-color !important;
+}
+.placeholder9{
+ color: #999999;
+}
+.placeholder6{
+ color: #666666;
+}
+.pointer{
+ cursor: pointer;
+}
+.table_btns{
+ border-bottom: 1px solid #eee;
+ padding-bottom: 10px;
+}
.ml20 {
- margin-left: 20px;
+ margin-left: 20px !important;
}
.mt30 {
- margin-top: 30px;
+ margin-top: 30px !important;
}
.mr30 {
--
Gitblit v1.9.3