From a79d066a973e5b25e59a08bfdf18e4b87e844571 Mon Sep 17 00:00:00 2001
From: "changhuiping.chp" <changhuiping.chp@digital-engine.com>
Date: Thu, 29 Jun 2023 18:55:49 +0800
Subject: [PATCH] fix: merge conflict fix

---
 datacenter/app/globals.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/datacenter/app/globals.css b/datacenter/app/globals.css
index 38471b71d..153cf633c 100644
--- a/datacenter/app/globals.css
+++ b/datacenter/app/globals.css
@@ -30,13 +30,14 @@ th {
 tr:nth-child(even) {
   background-color: #f2f2f2;
 }
-
 tr:hover {
   background-color: #ddd;
 }
 
-html body .ant-btn-primary {
+body .ant-btn-primary {
   background-color: #1677ff;
+}
+
 .ant-pagination .ant-pagination-prev * {
   color: rgb(145, 35, 167) !important;
 }