From f5d2600e1423afe6a49dee541ea5599d588b19f3 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Tue, 10 Sep 2024 09:16:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master

---
 gz-customerSystem/src/styles/public.less |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/gz-customerSystem/src/styles/public.less b/gz-customerSystem/src/styles/public.less
index c9929ba..d54605e 100644
--- a/gz-customerSystem/src/styles/public.less
+++ b/gz-customerSystem/src/styles/public.less
@@ -15,6 +15,11 @@
 	src: url('../assets/font/DingTalk_JinBuTi_Regular.ttf');
 }
 
+@font-face {
+	font-family: DouYu;
+	src: url('../assets/font/DingTalk_JinBuTi_Regular.ttf');
+}
+
 html,
 body {
 	margin: 0;
@@ -794,6 +799,21 @@
 	}
 }
 
+//字节对话框
+.arco-modal-simple {
+	width: 400px;
+
+	.arco-modal-header {
+		padding: 0;
+		margin-bottom: 0;
+	}
+
+	.arco-modal-footer {
+		text-align: right;
+		margin-top: 0;
+	}
+}
+
 //弹窗底部按钮
 .dialogFooter {
 	width: 100%;
@@ -809,10 +829,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