From 65c8026eaeff3d769a1d168933e13035708233e0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 10:00:48 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/styles/public.less | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gz-customerSystem/src/styles/public.less b/gz-customerSystem/src/styles/public.less
index c9929ba..03efcd4 100644
--- a/gz-customerSystem/src/styles/public.less
+++ b/gz-customerSystem/src/styles/public.less
@@ -809,10 +809,18 @@
.dialogBack {}
}
+// .arco-btn-primary:not(.arco-btn-disabled) {
+// background-color: @main-color;
+
+// &:hover {
+// background-color: @main-color;
+// }
+// }
+
.arco-btn-primary:not(.arco-btn-disabled) {
background-color: @main-color;
+}
- &:hover {
- background-color: @main-color;
- }
+.arco-btn-primary:not(.arco-btn-disabled):not(.arco-btn-loading):hover {
+ background-color: @main-color;
}
\ No newline at end of file
--
Gitblit v1.8.0