From b23ce971023b2ace9015a9bc7e6093acca12924a Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Thu, 15 Sep 2022 14:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/styles/element.scss | 23 +++++++++++++++++------
 admin/src/styles/index.scss   | 27 ++-------------------------
 admin/src/styles/public.scss  | 18 ++++++++++++++++++
 admin/src/styles/tailwind.css |  3 +++
 admin/src/styles/var.css      |  4 ++--
 5 files changed, 42 insertions(+), 33 deletions(-)
 create mode 100644 admin/src/styles/public.scss
 create mode 100644 admin/src/styles/tailwind.css

diff --git a/admin/src/styles/element.scss b/admin/src/styles/element.scss
index 1445627b..e3f4a7e1 100644
--- a/admin/src/styles/element.scss
+++ b/admin/src/styles/element.scss
@@ -96,6 +96,7 @@
             font-size: var(--el-font-size-small);
         }
     }
+
     .el-button--primary {
         --el-button-hover-link-text-color: var(--el-color-primary-light-3);
     }
@@ -111,12 +112,6 @@
     .el-button--danger {
         --el-button-hover-link-text-color: var(--el-color-danger-light-3);
     }
-
-    .el-image__error {
-        font-size: 12px;
-        text-align: center;
-        padding: 4px;
-    }
 }
 @media (max-width: 768px) {
     .el-pagination > .el-pagination__jump {
@@ -126,3 +121,19 @@
         display: none !important;
     }
 }
+
+.el-button {
+    // 防止被tailwindcss默认样式覆盖
+    background-color: var(--el-button-bg-color, var(--el-color-white));
+
+    //覆盖el-button的点击样式
+    &:focus {
+        border-color: var(--el-button-border-color);
+        background-color: var(--el-button-bg-color);
+    }
+    &:hover {
+        color: var(--el-button-hover-text-color);
+        border-color: var(--el-button-hover-border-color);
+        background-color: var(--el-button-hover-bg-color);
+    }
+}
diff --git a/admin/src/styles/index.scss b/admin/src/styles/index.scss
index b4f109a7..7bd17260 100644
--- a/admin/src/styles/index.scss
+++ b/admin/src/styles/index.scss
@@ -1,29 +1,6 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
 
-@layer base {
-    body {
-        @apply text-base text-tx-primary overflow-hidden min-w-[375px];
-    }
-    .form-tips {
-        @apply text-tx-secondary text-xs leading-6 mt-1;
-    }
-    .el-button {
-        background-color: var(--el-button-bg-color, var(--el-color-white));
-    }
-    .clearfix:after {
-        content: '';
-        display: block;
-        clear: both;
-        visibility: hidden;
-    }
-}
-
-/* NProgress */
-#nprogress .bar {
-    @apply bg-primary #{!important};
-}
 @import 'element.scss';
 @import 'dark.css';
 @import 'var.css';
+@import 'tailwind.css';
+@import 'public.scss';
diff --git a/admin/src/styles/public.scss b/admin/src/styles/public.scss
new file mode 100644
index 00000000..a11a8bd9
--- /dev/null
+++ b/admin/src/styles/public.scss
@@ -0,0 +1,18 @@
+body {
+    @apply text-base text-tx-primary overflow-hidden min-w-[375px];
+}
+.form-tips {
+    @apply text-tx-secondary text-xs leading-6 mt-1;
+}
+
+.clearfix:after {
+    content: '';
+    display: block;
+    clear: both;
+    visibility: hidden;
+}
+
+/* NProgress */
+#nprogress .bar {
+    @apply bg-primary #{!important};
+}
diff --git a/admin/src/styles/tailwind.css b/admin/src/styles/tailwind.css
new file mode 100644
index 00000000..bd6213e1
--- /dev/null
+++ b/admin/src/styles/tailwind.css
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
\ No newline at end of file
diff --git a/admin/src/styles/var.css b/admin/src/styles/var.css
index e3e9e098..b9377057 100644
--- a/admin/src/styles/var.css
+++ b/admin/src/styles/var.css
@@ -18,7 +18,7 @@
     --el-font-size-extra-small: 12px;
 
     --el-bg-color: var(--color-white);
-    --el-bg-color-page: #f2f3f5;
+    --el-bg-color-page: #f6f6f6;
     --el-bg-color-overlay: #ffffff;
     --el-text-color-primary: #333333;
     --el-text-color-regular: #666666;
@@ -32,7 +32,7 @@
     --el-border-color-dark: #d4d7de;
     --el-border-color-darker: #cdd0d6;
     --el-fill-color: #f0f2f5;
-    --el-fill-color-light: #f8f8f8;
+    --el-fill-color-light: #f5f7fa;
     --el-fill-color-lighter: #fafafa;
     --el-fill-color-extra-light: #fafcff;
     --el-fill-color-dark: #ebedf0;