diff --git a/src/glcc/home/contact/index.jsx b/src/glcc/home/contact/index.jsx index 0e7d8a39..4f802754 100644 --- a/src/glcc/home/contact/index.jsx +++ b/src/glcc/home/contact/index.jsx @@ -16,7 +16,7 @@ function Contact() {

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

交流QQ群: 210174286

-

合作推广: gitlink@ccf.org.cn

+

合作推广: glcc@ccf.org.cn

diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx index 68aa8e7d..91e5ac8e 100644 --- a/src/glcc/home/index.jsx +++ b/src/glcc/home/index.jsx @@ -107,7 +107,7 @@ export default (props) => {
- 活动特邀合作单位 OpenMMlab + 活动特邀合作单位 OpenMMLab
diff --git a/src/glcc/img/star.png b/src/glcc/img/star.png new file mode 100644 index 00000000..6782ed83 Binary files /dev/null and b/src/glcc/img/star.png differ diff --git a/src/glcc/project/index.scss b/src/glcc/project/index.scss index f9c141bb..7bb5ca0f 100644 --- a/src/glcc/project/index.scss +++ b/src/glcc/project/index.scss @@ -194,8 +194,9 @@ } } } -.projectItemPopover{ +.ant-popover.projectItemPopover{ width: 1200px; + z-index: 1000; .ant-popover-content .ant-popover-arrow{ border-width: 12px; } diff --git a/src/glcc/project/projectList/index.jsx b/src/glcc/project/projectList/index.jsx index a9aa48b8..6d793ec8 100644 --- a/src/glcc/project/projectList/index.jsx +++ b/src/glcc/project/projectList/index.jsx @@ -6,6 +6,7 @@ import { projectList } from '../../api'; import ProjectDetail from '../component/projectDetail'; import bgPng from "../../img/bgPng.png"; import logo from "../../img/logo.png"; +import star from "../../img/star.png"; const { Search } = Input; // 项目列表 @@ -51,7 +52,7 @@ function ProjectList({ applyTaskId, current_user, showLoginDialog, isStudentAppl } openmmlab && setTimeout(() => { let openProject = document.querySelector(`.${openmmlab}`); - if(openProject){ + if (openProject) { openProject.click(); let height = document.documentElement.clientWidth / 1920 * 500 + 71 + 70 + 100 + openProject.offsetTop; window.scrollTo(0, height); @@ -64,9 +65,9 @@ function ProjectList({ applyTaskId, current_user, showLoginDialog, isStudentAppl function changeVisible(visible, item) { if (visible) { - let height = document.documentElement.clientWidth / 1920 * 500 + 70 + document.querySelector(`.${item.gitlinkLastUrl}`).offsetTop + item.registrationTaskList.length*320; + let height = document.documentElement.clientWidth / 1920 * 500 + 70 + document.querySelector(`.${item.gitlinkLastUrl}`).offsetTop + item.registrationTaskList.length * 320; document.querySelector('#taskList').style.height = height + 'px'; - }else{ + } else { document.querySelector('#taskList').style.height = 'auto'; } } @@ -93,7 +94,10 @@ function ProjectList({ applyTaskId, current_user, showLoginDialog, isStudentAppl >
-
+
+ {!gitlinkLastUrl && !openmmlab && item.recommendFlag ? : ''} + +
{item.projectName}
{item.projectIntro}
diff --git a/src/glcc/project/projectList/index.scss b/src/glcc/project/projectList/index.scss index 2e59065b..6a1d0a3a 100644 --- a/src/glcc/project/projectList/index.scss +++ b/src/glcc/project/projectList/index.scss @@ -29,6 +29,7 @@ border-radius:2px 2px 0px 0px; } .projectLogo{ + position: relative; width: 100px; height: 100px; border: 1px solid #fff; @@ -38,11 +39,19 @@ overflow: hidden; margin: 25px auto 10px; line-height: 95px; - img{ + overflow: visible; + .projectLogoImg{ width: 100%; // height: 100%; // display: block; } + .projectLogoStar{ + position: absolute; + top:0; + right: 0; + width: 28px; + transform: rotate(46deg); + } } .title{ color:#2a51bf; diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 4e3288dd..e0bb6ae2 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -27,7 +27,7 @@ body>.-task-title { width: 100%; height:58px; min-width: 1200px; - z-index: 1031; + z-index: 1001; position: fixed; background: #1B2440; color: #fff;