diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index 3e9b01cff..8ac3dd69a 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -276,36 +276,36 @@ li.ant-menu-item{ .-task-sidebar { position: fixed; width: 40px; - right: 10px; + right: 30px; bottom: 80px; z-index: 10; } -@media screen and (max-width: 1920px){ - .-task-sidebar{ - right:220px; - } -} -@media screen and (max-width: 1750px){ - .-task-sidebar{ - right:160px; - } -} -@media screen and (max-width: 1650px){ - .-task-sidebar{ - right:115px; - } -} -@media screen and (max-width: 1550px){ - .-task-sidebar{ - right:90px; - } -} -@media screen and (max-width: 1450px){ - .-task-sidebar{ - right:45px; - } -} +// @media screen and (max-width: 1920px){ +// .-task-sidebar{ +// right:220px; +// } +// } +// @media screen and (max-width: 1750px){ +// .-task-sidebar{ +// right:160px; +// } +// } +// @media screen and (max-width: 1650px){ +// .-task-sidebar{ +// right:115px; +// } +// } +// @media screen and (max-width: 1550px){ +// .-task-sidebar{ +// right:90px; +// } +// } +// @media screen and (max-width: 1450px){ +// .-task-sidebar{ +// right:45px; +// } +// } @media screen and (max-width: 1200px){ .-task-sidebar{ right:0px; diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx index 76bf64f4a..8b62aa127 100644 --- a/src/glcc/home/index.jsx +++ b/src/glcc/home/index.jsx @@ -14,7 +14,7 @@ import apply2 from "../img/apply2.png"; import './index.scss'; export default (props) => { - const { current_user, isGlccApplyDate, showNotification, studentApplyStart } = props; + const { current_user, isGlccApplyDate, showNotification, studentApplyStart,history } = props; function goToApply() { if (isGlccApplyDate) { if (current_user && current_user.login) { @@ -33,7 +33,7 @@ export default (props) => { if(!studentApplyStart){ showNotification("不在报名时间,报名开始时间为5月26日"); }else{ - window.location.href="/glcc/subjects"; + history.push("/glcc/subjects"); } } @@ -50,14 +50,14 @@ export default (props) => { {/* 报名入口 */}
{/* 项目报名 */} -
+
- 项目报名 - 项目报名已截止 + 查看项目 + {/* 项目报名已截止 */}
-
项目报名开启,导师席位虚位以待
-
+
查看夏令营各项目,掌握项目课题详细信息
+ {/* 学生报名 */}
diff --git a/src/glcc/home/index.scss b/src/glcc/home/index.scss index 5805d848d..d7b5c4486 100644 --- a/src/glcc/home/index.scss +++ b/src/glcc/home/index.scss @@ -52,16 +52,16 @@ &:hover, &:hover .til{ color:#466aff; } - .hover-show{ - display: none; - } - &:hover .hover-none, &:hover .pt6{ + // .hover-show{ + // display: none; + // } + &:hover .pt6{ display: none; } &:hover.project{ - background-image:linear-gradient(45deg,#EBEFFF 0%, #E0E4F9 50.63%,#F1F1F1 100%); - box-shadow:0px 0px 6px #466aff; - cursor: default; + // background-image:linear-gradient(45deg,#EBEFFF 0%, #E0E4F9 50.63%,#F1F1F1 100%); + // box-shadow:0px 0px 6px #466aff; + // cursor: default; .hover-show{ display: inline-block; margin-left: 10px; diff --git a/src/glcc/home/partner/index.jsx b/src/glcc/home/partner/index.jsx index 54b9b0357..fbe173044 100644 --- a/src/glcc/home/partner/index.jsx +++ b/src/glcc/home/partner/index.jsx @@ -1,6 +1,7 @@ import React from 'react'; import './index.scss'; import ccf from '../../img/ccf_logo.png'; +import ccf1 from '../../img/ccf_logo1.png'; import gitlink from '../../img/gitlink.png'; import xjy from '../../img/xjy.png'; import sponsor11 from '../../img/sponsor11.png'; @@ -9,6 +10,7 @@ import sponsor22 from '../../img/sponsor22.png'; import sponsor23 from '../../img/sponsor23.png'; import sponsor31 from '../../img/sponsor31.png'; import sponsor32 from '../../img/sponsor32.png'; +import sponsor33 from '../../img/sponsor33.png'; import sponsor41 from '../../img/sponsor41.png'; @@ -45,7 +47,7 @@ function Partner() {
主办方 -
{window.open("https://www.ccf.org.cn/")}} className='div8b9'>
+
{window.open("https://www.ccf.org.cn/")}} className='div8b9'>
承办方 @@ -81,13 +83,14 @@ function Partner() {
{window.open("https://aws.amazon.com/cn/")}}>亚马逊云科技
{window.open("https://www.didiglobal.com/")}}>滴滴出行
+
{window.open("https://www.99cloud.net/")}}>九州云
白银赞助商
-
{window.open("https://www.bytedance.com/")}}>字节跳动
+
{window.open(" https://www.cloudwego.io/")}}>cloudwego
diff --git a/src/glcc/img/ccf_logo.png b/src/glcc/img/ccf_logo.png index 1a36d4615..e5ed48126 100644 Binary files a/src/glcc/img/ccf_logo.png and b/src/glcc/img/ccf_logo.png differ diff --git a/src/glcc/img/ccf_logo1.png b/src/glcc/img/ccf_logo1.png new file mode 100644 index 000000000..1a36d4615 Binary files /dev/null and b/src/glcc/img/ccf_logo1.png differ diff --git a/src/glcc/img/sponsor31.png b/src/glcc/img/sponsor31.png index 3091232a2..888be38bf 100644 Binary files a/src/glcc/img/sponsor31.png and b/src/glcc/img/sponsor31.png differ diff --git a/src/glcc/img/sponsor33.png b/src/glcc/img/sponsor33.png new file mode 100644 index 000000000..941262d05 Binary files /dev/null and b/src/glcc/img/sponsor33.png differ diff --git a/src/glcc/img/sponsor41.png b/src/glcc/img/sponsor41.png index 3b68d7258..8710cd0f9 100644 Binary files a/src/glcc/img/sponsor41.png and b/src/glcc/img/sponsor41.png differ diff --git a/src/glcc/project/projectList/index.scss b/src/glcc/project/projectList/index.scss index 6187d4225..2e59065bc 100644 --- a/src/glcc/project/projectList/index.scss +++ b/src/glcc/project/projectList/index.scss @@ -37,7 +37,7 @@ text-align: center; overflow: hidden; margin: 25px auto 10px; - line-height: 100px; + line-height: 95px; img{ width: 100%; // height: 100%;