Merge remote-tracking branch 'origin/master'

This commit is contained in:
zer0Black
2021-03-26 18:15:15 +08:00
8 changed files with 158 additions and 86 deletions
+44 -41
View File
@@ -62,8 +62,8 @@
<a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>
</a-form-item>
</a-col>
<a-col :span="7"></a-col>
<a-col :span="4" style="text-align: right;color: #1891FF;">
<a-col :span="6"></a-col>
<a-col :span="5" style="text-align: right;color: #1891FF;">
<a-form-item>
<router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
忘记密码
@@ -289,50 +289,53 @@
.ant-row{
margin-bottom: 4%;
}
.user-layout-login{
width: 24%;
height: 56%;
padding: 3% 0 3% 0;
min-width: 400px;
min-height: 460px;
background: #fff;
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
border-radius: 20px;
position: absolute;
right: 8%;
top: 50%;
-webkit-transform: translateY(-50%);
-moz-transform: translateY(-50%);
-ms-transform: translateY(-50%);
-o-transform: translateY(-50%);
transform: translateY(-50%);
.user-box{
width: 100%;
height: 100%;
overflow: hidden;
display: flex;
justify-content: space-between;
flex-direction: column;
.title{
display: block;
color: #1891FF;
font-size: 28px;
font-weight: 500;
margin: 0 0 5% 0;
text-align: center;
}
.login-btn{
margin-bottom: 0;
font-size: 10px;
.main{
.user-layout-login{
width: 24%;
height: 56%;
padding: 3% 0 3% 0;
min-width: 332px;
min-height: 460px;
background: #fff;
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
border-radius: 20px;
position: absolute;
right: 8%;
top: 50%;
-webkit-transform: translateY(-50%);
-moz-transform: translateY(-50%);
-ms-transform: translateY(-50%);
-o-transform: translateY(-50%);
transform: translateY(-50%);
.user-box{
width: 100%;
height: 100%;
overflow: hidden;
display: flex;
justify-content: space-between;
flex-direction: column;
.title{
display: block;
color: #1891FF;
font-size: 28px;
font-weight: 500;
margin: 0 0 5% 0;
text-align: center;
}
.login-btn{
margin-bottom: 0;
font-size: 10px;
}
}
}
}
@media all and (max-width:600px){ // 分辨率<=600px
.user-layout-login{
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
top: 50% !important;
left: 50% !important;
transform: translate(-50%,-50%) !important;
}
}
</style>