merge 开源夏令营issue 1

This commit is contained in:
谢思 2022-04-12 16:18:59 +08:00 committed by caishi
parent 72ec7103d0
commit 977e6afbc0
9 changed files with 50 additions and 48 deletions

View File

@ -276,7 +276,7 @@ li.ant-menu-item{
.-task-sidebar {
position: fixed;
width: 40px;
right: 0;
right: 10px;
bottom: 80px;
z-index: 10;
}

View File

@ -111,7 +111,7 @@ function Apply(props) {
return(
<div className="glcc_apply">
<div className='apply'>
<Breadcrumb className='pt20'>
<Breadcrumb className='pt20 font-16'>
<Breadcrumb.Item><a href="/glcc">开源夏令营</a></Breadcrumb.Item>
<Breadcrumb.Item>项目报名</Breadcrumb.Item>
</Breadcrumb>
@ -131,18 +131,18 @@ function Apply(props) {
{cateList && cateList.map(item=> {return <Option value={item.name} key={item.id}>{item.name}</Option>})}
</Select>
)}
{helper('GitLink地址',
'',
'gitlinkUrl',
[{ required: true, message: "请正确输入GitLink项目地址" }],
<Input placeholder="请输入GitLink地址" onBlur={()=>{verify("gitlink")}} disabled = {userApplyInfo ? true : false} className={userApplyInfo? "disabledInput":""}/>
)}
{helper('官网地址',
'',
'officialWebsiteUrl',
[],
<Input placeholder="请输入官网地址" disabled = {userApplyInfo ? true : false} className={userApplyInfo? "disabledInput":""}/>
)}
{helper('GitLink地址',
'',
'gitlinkUrl',
[{ required: true, message: "请正确输入GitLink地址" }],
<Input placeholder="请输入GitLink地址" onBlur={()=>{verify("gitlink")}} disabled = {userApplyInfo ? true : false} className={userApplyInfo? "disabledInput":""}/>
)}
<div className='introArea'>{helper('项目简介',
'',
'projectIntro',
@ -170,7 +170,7 @@ function Apply(props) {
</div>}
</Upload>
)}</div>
<p className='introArea tips'>: 课题及导师信息请在Gitlink项目中以issue的形式编辑</p>
<p className='introArea tips'>: 课题及导师信息请在GitLink项目中以issue的形式编辑</p>
{!userApplyInfo && <Form.Item className='subInfo introArea'>
<Button type="primary" htmlType="submit" className='sub'>提交</Button>
</Form.Item>}

View File

@ -8,7 +8,7 @@
.glcc_info_form{
display: flex;
flex-wrap: wrap;
margin-left: -40px;
margin-left: -25px;
.ant-row.ant-form-item{
margin-bottom: 20px;
display: flex;

View File

@ -1,6 +1,7 @@
import React from 'react';
import './index.scss';
import gitlink1 from '../../img/gitlink1.png';
import gitlink2 from '../../img/gitlink2.png';
function Contact() {
@ -12,13 +13,23 @@ function Contact() {
<div className="contact-info">
<h4 className="contact-invite">期待你的加入和我们一起推动开源繁荣发展</h4>
<div className="contact-way">
<p>问题咨询12345689@qq.com</p>
<p>合作推广56898989416@hotmail.com</p>
<p>问题资讯: 12345689@qq.com</p>
<p>合作推广: 56898989416@hotmail.com</p>
</div>
</div>
<div className='attention'>
<div className='one'>
<div className='attentionDiv'><img src={gitlink1}/></div>
<p>加入GitLink</p>
<p>社区QQ群</p>
</div>
<div>
<div className='attentionDiv'><img src={gitlink2}/></div>
<p>关注GitLink</p>
<p>微信公众号</p>
</div>
</div>
</div>
<div className="contact-line"></div>
</div>
</div>
)

View File

@ -1,18 +1,5 @@
.contact {
width: 100%;
// height: 5002px;
// background-image: linear-gradient(
// 163.51deg,
// #eff3fe 0%,
// #ebeffb 9.63%,
// #f0f4ff 16.73%,
// #e8edfc 33.05%,
// #e5ecff 43.93%,
// #e3eaf6 72.41%,
// #dce8ff 84.35%,
// #ffffff 94.79%,
// #ecf4ff 100%
// );
background-image: url('../../img/contact_bg.png');
background-size: 100% 100%;
.glcc-content {
@ -40,11 +27,15 @@
border-bottom: 1px solid rgba(55, 142, 255, 0.2);
.attention{
display: flex;
.attentionDiv{
width: 140px;
height: 140px;
line-height: 140px;
background-color: #ffffff;
img{width: 90%;}
}
div{
text-align: center;
img{
width: 140px;
}
&.one{
margin-right: 80px;
}

View File

@ -37,7 +37,7 @@
justify-content: space-between;
}
.info-item {
width: 20%;
width: 22%;
min-width: 240px;
text-align: center;
.info-item-img {

View File

@ -52,17 +52,17 @@ function Partner() {
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>铂金赞助商</p>
</div>
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>铂金赞助商</p>
</div>
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>铂金赞助商</p>
</div>
</div>
{/* 三级赞助商 */}
@ -70,17 +70,17 @@ function Partner() {
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>黄金赞助商</p>
</div>
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>黄金赞助商</p>
</div>
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>黄金赞助商</p>
</div>
</div>
{/* 四级赞助商 */}
@ -88,17 +88,17 @@ function Partner() {
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>白银赞助商</p>
</div>
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>白银赞助商</p>
</div>
<div>
<img src={gitlink} className='gitlink'/>
<p className='bor'></p>
<p>钻石赞助商</p>
<p>白银赞助商</p>
</div>
</div>
</div>

View File

@ -63,22 +63,22 @@
box-shadow:0px 0px 10px rgba(255, 255, 255, 0.76);
}}
&.one_sponsor>div{
background-image:linear-gradient(135.33deg,#636363 0%,#7b7b7b 21.34%,#6d6d6d 47.69%,#717171 61.08%,#606060 75.73%,#414141 100%);
background-image:linear-gradient(135.33deg,#333333 0%,#474747 21.34%,#929292 44.35%,#575757 61.08%,#444444 75.73%,#212121 100%);
border:1px solid #c4bfba;
>.bor{background-image: linear-gradient(242.92deg,#f9e9b1 0%,#fff2d2 52.29%,#ebcc90 100%);}
>.bor{background-image:linear-gradient(242.92deg,#f9e9b1 0%,#fff2d2 52.29%,#ebcc90 100%);}
}
&.two_sponsor>div{
background-image:linear-gradient(135.33deg,#8d90af 0%,#8e92b8 21.34%,#7178ab 47.69%,#7879a4 72.15%,#81839c 100%);
border:1px solid #cccaef;
>.bor{background-color:#abb3eb;}
background-image:linear-gradient(135.33deg,#ffffff 0%,#d8d8d8 21.34%,#aeaeae 34.31%,#fcfcfc 47.69%,#bbbbbb 64.44%,#f2f2f2 81.59%,#828282 100%);
border:1px solid #dbdbdd;
>.bor{background-color:#ffffff;}
}
&.three_sponsor>div{
background-image:linear-gradient(135.33deg,#95764d 0%,#d4b893 21.34%,#b89360 47.69%,#bb9362 72.15%,#a07f54 100%);
background-image:linear-gradient(135.33deg,#ba973a 0%,#c7a948 21.34%,#d1ae33 47.69%,#ffdb72 72.15%,#b37907 100%);
border:1px solid #efe3ca;
>.bor{background-image:linear-gradient(242.92deg,#f9e9b1 0%,#fff2d2 52.29%,#ebcc90 100%);}
}
&.four_sponsor>div{
background-image:linear-gradient(135.33deg,#d6d6d6 0%,#d7d7d7 21.34%,#fbfbfb 47.69%,#d5d5d5 72.15%,#e4e4e6 100%);
background-image:linear-gradient(135.33deg,#636363 0%,#bebebe 21.34%,#979797 43.51%,#9c9c9c 61.08%,#8d8d8d 75.73%,#727272 100%);
border:1px solid #dbdbdd;
>.bor{background-color:#ffffff;}
>p{color: #000000;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB