From bc76c2de5632fe1433acd92dddc5842b99a06890 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 03 Nov 2021 20:22:05 +0800
Subject: [PATCH] 解决冲突

---
 src/styles/login.scss |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/styles/login.scss b/src/styles/login.scss
index 2f828c7..a1a4261 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -93,6 +93,7 @@
   font-size: 40px;
   width: 445px;
   margin: 0;
+  padding-bottom: 20px;
   text-align: center;
   letter-spacing: 4px;
 }
@@ -117,7 +118,7 @@
   font-weight: 300;
   color: #409EFF;
   cursor: pointer;
-  margin-top: 30px;
+  margin-top: 5px;
   font-family: "neo";
   transition: 0.25s;
 }
@@ -195,7 +196,7 @@
 }
 
 .login-main .login-form .el-form-item--feedback:nth-child(1),.el-form-item--feedback:nth-child(2){
-  margin-bottom: 20px !important;
+  margin-bottom: 30px !important;
 }
 
 .login-title-child{

--
Gitblit v1.9.3