From 0aac9d11e0b37cf9c9187d363bdcf959b7e4cec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Fri, 17 Jun 2022 13:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0glcc=E6=98=8E=E6=98=9F?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=8A=E5=85=B6=E5=AE=83issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/home/contact/index.jsx | 2 +- src/glcc/home/index.jsx | 2 +- src/glcc/img/star.png | Bin 0 -> 2735 bytes src/glcc/project/index.scss | 3 ++- src/glcc/project/projectList/index.jsx | 12 ++++++++---- src/glcc/project/projectList/index.scss | 11 ++++++++++- src/modules/tpm/TPMIndex.css | 2 +- 7 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 src/glcc/img/star.png 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 0000000000000000000000000000000000000000..6782ed837abf528eacc5c71b7dd0d58d2faae1ca GIT binary patch literal 2735 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 literal 0 HcmV?d00001 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;