From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/loginPage/loginPage.vue | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/views/loginPage/loginPage.vue b/src/views/loginPage/loginPage.vue
index b285c23..fab7b59 100644
--- a/src/views/loginPage/loginPage.vue
+++ b/src/views/loginPage/loginPage.vue
@@ -78,6 +78,30 @@
</script>
<style scoped lang="scss">
+ @media screen and (min-width: 1200px){
+ .loginContent{
+ display: flex;
+ justify-content: space-around;
+ padding: 0 200px;
+ }
+ .loginContL {
+ font-size: 60px;
+ font-weight: bold;
+ margin-bottom: 100px;
+ }
+ }
+ @media screen and (min-width: 960px) and (max-width: 1200px){
+ .loginContent{
+ display: flex;
+ justify-content: space-between;
+ padding: 0 40px;
+ }
+ .loginContL {
+ font-size: 40px;
+ font-weight: bold;
+ margin-bottom: 80px;
+ }
+ }
.login-container {
width: 100%;
height: 100%;
@@ -108,21 +132,17 @@
.rights {
font-size: 16px;
color: #fff;
+ position: absolute;
+ bottom: 30px;
}
.loginContent {
width: 100%;
- padding: 0 200px;
- display: flex;
flex-wrap: wrap;
align-items: center;
- justify-content: space-around;
margin-bottom: 60px;
.loginContL {
width: 100%;
- font-size: 60px;
- font-weight: bold;
- margin-bottom: 100px;
.apTitleT {
color: #fff;
--
Gitblit v1.9.2