From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:31:18 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/views/login/index.scss |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/views/login/index.scss b/src/views/login/index.scss
index cb8b3af..e4b51c4 100644
--- a/src/views/login/index.scss
+++ b/src/views/login/index.scss
@@ -48,6 +48,13 @@
       background-color: var(--mk-sys-color5);
       border-color: var(--mk-sys-color5);
     }
+    .login-form-button.disabled {
+      background-color: var(--mk-sys-color5);
+      border-color: var(--mk-sys-color5);
+      color: #ffffff;
+      cursor: not-allowed;
+      opacity: 0.9;
+    }
 
     .login-way-wrap {
       .login-way.active, .login-way:hover {
@@ -159,6 +166,7 @@
       .btn-login {
         margin-bottom: 3vh;
         clear: both;
+        height: auto;
       }
       .register-line {
         font-size: 14px;
@@ -181,6 +189,7 @@
         display: inline-block;
         margin-bottom: 3vh;
         margin-top: -10px;
+        height: 35px;
       }
       .minline.right {
         float: right;
@@ -192,6 +201,28 @@
           .ant-select-selection-selected-value {
             float: right;
             margin-right: 10px;
+          }
+        }
+      }
+      .proline {
+        display: inline-block;
+        margin-bottom: 10px;
+        height: auto;
+        margin-top: calc(-3vh + 10px);
+        font-size: 13px;
+        .ant-form-item-children {
+          display: flex;
+          align-items: flex-start;
+          line-height: 1.5;
+          color: rgba(0, 0, 0, 0.5);
+
+          // .ant-checkbox-inner {
+          //   width: 15px;
+          //   height: 15px;
+          // }
+
+          a {
+            color: var(--mk-sys-color);
           }
         }
       }
@@ -244,9 +275,7 @@
     padding-top: 20px;
     p {
       margin-bottom: 5px;
-    }
-    p + br {
-      display: none;
+      text-align: center;
     }
     a {
       color: var(--mk-sys-font-color);

--
Gitblit v1.8.0