diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index da292d23..3e9b01cf 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -276,7 +276,7 @@ li.ant-menu-item{ .-task-sidebar { position: fixed; width: 40px; - right: 0; + right: 10px; bottom: 80px; z-index: 10; } diff --git a/src/glcc/apply/index.jsx b/src/glcc/apply/index.jsx index 57fe176f..1a79ed8c 100644 --- a/src/glcc/apply/index.jsx +++ b/src/glcc/apply/index.jsx @@ -111,7 +111,7 @@ function Apply(props) { return(
- + 开源夏令营 项目报名 @@ -131,18 +131,18 @@ function Apply(props) { {cateList && cateList.map(item=> {return })} )} + {helper('GitLink地址', + '', + 'gitlinkUrl', + [{ required: true, message: "请正确输入GitLink项目地址" }], + {verify("gitlink")}} disabled = {userApplyInfo ? true : false} className={userApplyInfo? "disabledInput":""}/> + )} {helper('官网地址', '', 'officialWebsiteUrl', [], )} - {helper('GitLink地址', - '', - 'gitlinkUrl', - [{ required: true, message: "请正确输入GitLink地址" }], - {verify("gitlink")}} disabled = {userApplyInfo ? true : false} className={userApplyInfo? "disabledInput":""}/> - )}
{helper('项目简介', '', 'projectIntro', @@ -170,7 +170,7 @@ function Apply(props) {
} )}
-

注: 课题及导师信息请在Gitlink项目中以issue的形式编辑

+

注: 课题及导师信息请在GitLink项目中以issue的形式编辑

{!userApplyInfo && } diff --git a/src/glcc/apply/index.scss b/src/glcc/apply/index.scss index c1a9a803..bca1758f 100644 --- a/src/glcc/apply/index.scss +++ b/src/glcc/apply/index.scss @@ -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; diff --git a/src/glcc/home/contact/index.jsx b/src/glcc/home/contact/index.jsx index eaeeb24f..82f6208f 100644 --- a/src/glcc/home/contact/index.jsx +++ b/src/glcc/home/contact/index.jsx @@ -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() {

期待你的加入,和我们一起推动开源繁荣发展!

-

问题咨询:12345689@qq.com

-

合作推广:56898989416@hotmail.com

+

问题资讯: 12345689@qq.com

+

合作推广: 56898989416@hotmail.com

+
+
+
+
+
+

加入GitLink

+

社区QQ群

+
+
+
+

关注GitLink

+

微信公众号

- -
) diff --git a/src/glcc/home/contact/index.scss b/src/glcc/home/contact/index.scss index 9d4679ec..672293ef 100644 --- a/src/glcc/home/contact/index.scss +++ b/src/glcc/home/contact/index.scss @@ -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; } diff --git a/src/glcc/home/lightspot/index.scss b/src/glcc/home/lightspot/index.scss index ecfe0040..3af8a7e5 100644 --- a/src/glcc/home/lightspot/index.scss +++ b/src/glcc/home/lightspot/index.scss @@ -37,7 +37,7 @@ justify-content: space-between; } .info-item { - width: 20%; + width: 22%; min-width: 240px; text-align: center; .info-item-img { diff --git a/src/glcc/home/partner/index.jsx b/src/glcc/home/partner/index.jsx index 8f5e6e18..0a292778 100644 --- a/src/glcc/home/partner/index.jsx +++ b/src/glcc/home/partner/index.jsx @@ -52,17 +52,17 @@ function Partner() {

-

钻石赞助商

+

铂金赞助商

-

钻石赞助商

+

铂金赞助商

-

钻石赞助商

+

铂金赞助商

{/* 三级赞助商 */} @@ -70,17 +70,17 @@ function Partner() {

-

钻石赞助商

+

黄金赞助商

-

钻石赞助商

+

黄金赞助商

-

钻石赞助商

+

黄金赞助商

{/* 四级赞助商 */} @@ -88,17 +88,17 @@ function Partner() {

-

钻石赞助商

+

白银赞助商

-

钻石赞助商

+

白银赞助商

-

钻石赞助商

+

白银赞助商

diff --git a/src/glcc/home/partner/index.scss b/src/glcc/home/partner/index.scss index 54336527..810a0e96 100644 --- a/src/glcc/home/partner/index.scss +++ b/src/glcc/home/partner/index.scss @@ -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; diff --git a/src/glcc/img/banner.png b/src/glcc/img/banner.png index 0c839df4..cedd3cc6 100644 Binary files a/src/glcc/img/banner.png and b/src/glcc/img/banner.png differ