From a7fb50c91e4932aa175be266fbdd42b2a70eba66 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 22 五月 2024 18:11:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/assets/style/style.scss | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index d281a72..d3e05e1 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%;
@@ -146,7 +147,7 @@
width: 200px !important;
}
.w300{
- width: 300px;
+ width: 300px !important;
}
.w400{
width: 400px !important;
@@ -213,15 +214,30 @@
.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