Merge branch 'gitlink_server' of https://gitlink.org.cn/Gitlink/forgeplus-react into feature_reposyncer

This commit is contained in:
谢思 2024-05-14 17:17:37 +08:00
commit fcd350c3c7
5 changed files with 21 additions and 14 deletions

View File

@ -23,6 +23,7 @@
<meta name="theme-color" content="#000000">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="referrer" content="always">
<meta name="viewport" content="width=device-width, user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0">
<link rel="canonical" href="https://gitlink.org.cn" data-turbo-transient="">
<link rel="fluid-icon" href="https://www.gitlink.org.cn/images/logo.png" title="GitLink">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
@ -51,7 +52,6 @@
<script src="%PUBLIC_URL%js/alex/moment.js"></script>
<script src="https://gw.alipayobjects.com/os/lib/alipay/alex/2.0.19/bundle/alex.all.global.min.js"></script>
<script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<meta name="viewport" content="width=device-width, user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0">
<%= htmlWebpackPlugin.tags.bodyTags %>
<script>
var _hmt = _hmt || [];

View File

@ -28,8 +28,7 @@ function Releases({ owner, projectsId, releaseVersions, distribution }) {
:
<div className="mt8">
暂无发行版
{distribution && <Link className="color-blue ml20" to={{pathname:`/${owner}/${projectsId}
new`,state:{stable:true}}}>发布新版本</Link>}
{distribution && <Link className="color-blue ml20" to={{pathname:`/${owner}/${projectsId}/releases/new`,state:{stable:true}}}>发布新版本</Link>}
</div>
}

View File

@ -3,6 +3,7 @@ import Login from "./Login";
import Register from "./Register";
import ResetPassword from "./ResetPassword";
import logo from './img/logo.svg';
import logo1 from './img/gitlinkLogo.png';
import banner from './img/banner.png';
import ball from './img/ball.png';
import img1 from './img/img1.png';
@ -21,6 +22,7 @@ function LoginRegisterPage(props){
</div>
</div>
<div className="login_register_right">
<img src={logo1} className="logoInSmall" alt="" onClick={()=>{window.location.href='/'}} />
{props.location.pathname === "/resetPassword" ?
<ResetPassword mygetHelmetapi={mygetHelmetapi}/>
:

View File

@ -48,6 +48,9 @@
.login_register_right{
height: 100%;
background-image: url(./img/rightBg.png);
.logoInSmall{
display: none;
}
.img1{
width: 15vw;
margin-top: 40vh;
@ -251,33 +254,36 @@
.login_register_left{
display: none;
}
.login_register_right .right_cont{
left: 20vw;
}
.login_register_right{
padding-top: 30px;
.right_cont{
position: static;
margin: 0 auto;
width: fit-content;
}
.img1, .img2{
display: none;
}
.logoInSmall{
display: block;
margin: 0 auto 30px;
}
}
}
@media screen and (max-width:500px) {
.login_register_right>div{
padding-top: 30%;
.login_register_right{
background-color: #f4f7ff;
background-image: none;
}
.login_register_right .right_cont{
// left: 10vw;
// padding: 20px;
// top: 40%;
position: static;
margin: 0 auto;
padding: 20px;
width: auto;
}
}
@media screen and (max-width:360px) {
.login_register_right .right_cont{
// left: 0;
.login_register_head>span:first-child{
font-size: 1.2em;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB