From d0764c7facff9abf00af6f3ff06a26260d1d8770 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 五月 2025 16:34:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/login/index.scss | 84 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/src/views/login/index.scss b/src/views/login/index.scss
index 58f4397..598e2be 100644
--- a/src/views/login/index.scss
+++ b/src/views/login/index.scss
@@ -5,6 +5,9 @@
background-size: cover;
background-repeat: no-repeat;
background-position: center center;
+ --mk-login-offset-top: 0px;
+ --mk-login-offset-left: 0px;
+
.logo {
position: relative;
height: 100px;
@@ -28,11 +31,14 @@
.login-middle {
position: relative;
- height: calc(100vh - 194px);
+ height: calc(100vh - 200px);
min-height: 420px;
- background-size: cover;
- background-position: center center;
border-bottom: 2px solid var(--mk-sys-color);
+ display: flex;
+ align-items: center;
+ justify-content: right;
+ padding-right: 20vw;
+ overflow: hidden;
.login-form-button {
background-color: var(--mk-sys-color);
@@ -41,6 +47,13 @@
.login-form-button[disabled] {
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 {
@@ -51,15 +64,15 @@
.login-form {
position: relative;
- float: right;
- margin-top: 5%;
- margin-right: 20%;
background: #ffffff;
width: 22vw;
min-width: 300px;
border-radius: 5px;
overflow: hidden;
border: 1px solid #bfbfbf;
+ top: var(--mk-login-offset-top, 0px);
+ left: var(--mk-login-offset-left, 0px);
+ transition: all 0.2s;
.login-way-title {
font-size: 18px;
@@ -153,6 +166,7 @@
.btn-login {
margin-bottom: 3vh;
clear: both;
+ height: auto;
}
.register-line {
font-size: 14px;
@@ -175,6 +189,7 @@
display: inline-block;
margin-bottom: 3vh;
margin-top: -10px;
+ height: 35px;
}
.minline.right {
float: right;
@@ -186,6 +201,34 @@
.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;
+ // }
+ input[type="checkbox"] {
+ width: 35px;
+ height: 22px;
+ top: -4px;
+ left: -4px;
+ }
+
+ a {
+ color: var(--mk-sys-color);
}
}
}
@@ -238,9 +281,7 @@
padding-top: 20px;
p {
margin-bottom: 5px;
- }
- p + br {
- display: none;
+ text-align: center;
}
a {
color: var(--mk-sys-font-color);
@@ -291,6 +332,12 @@
}
}
}
+
+ .qr-wrap + img {
+ width: 24px;
+ margin-right: 5px;
+ vertical-align: middle;
+ }
}
}
.mk-user-option {
@@ -318,23 +365,8 @@
@media screen and (max-width: 500px) {
.login-container {
.login-middle {
- .login-form {
- float: unset;
- margin: 0 auto;
- margin-top: 5%;
- }
- }
- }
-}
-
-@media screen and (min-width: 1550px) {
- .login-container {
- .ant-tabs.ant-tabs-card {
- .ant-tabs-card-bar {
- .ant-tabs-tab {
- font-size: 20px;
- }
- }
+ justify-content: center;
+ padding-right: 0px;
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0