From 81623b38f73cd318273f77c19865015b7a0ceeff Mon Sep 17 00:00:00 2001 From: caishi Date: Fri, 10 Sep 2021 09:50:29 +0800 Subject: [PATCH] style --- src/forge/Branch/Select.jsx | 4 ++-- src/forge/Component/Component.scss | 2 ++ src/forge/Component/Contributors.jsx | 5 ++--- src/forge/Component/CopyTool.jsx | 1 + src/forge/Component/Releases.jsx | 12 +++-------- src/forge/Main/CoderDepot.jsx | 21 ++++++++++++------ src/forge/Main/Index.scss | 32 +++++++++++++++++----------- src/forge/Main/list.scss | 10 +++------ src/forge/Main/sub/DetailBanner.jsx | 12 +++++------ 9 files changed, 53 insertions(+), 46 deletions(-) diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx index a44584c4..073658d9 100644 --- a/src/forge/Branch/Select.jsx +++ b/src/forge/Branch/Select.jsx @@ -26,9 +26,9 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
{/* {nav === 0 ?"分支":"标签"} */} - + {showValue} - +
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index 2b588266..619a677e 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -163,6 +163,8 @@ li.ant-menu-item{ } } .hoverA{ + display: flex; + align-items: center; &:hover a{ color:#2A61FF !important ; } diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index 93f7b2cc..47d83f0f 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -149,10 +149,9 @@ function Contributors({contributors,owner,projectsId,currentLogin}){ return(
- - 贡献者 + 贡献者 { contributors && contributors.total_count > 0 && {contributors.total_count}} - +
setVisibleFunc(false)}> { total > 0 ? diff --git a/src/forge/Component/CopyTool.jsx b/src/forge/Component/CopyTool.jsx index 96f7900a..93cea487 100644 --- a/src/forge/Component/CopyTool.jsx +++ b/src/forge/Component/CopyTool.jsx @@ -31,6 +31,7 @@ function CopyTool({ beforeText, afterText, className , inputId , timeOut }) { if(timeOut){ setTimeout(function(){ setTitle(beforeText); + document.getSelection().removeAllRanges(); },1500) } }, []); diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index 5c6d75cf..7e682983 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -6,15 +6,9 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType} return(
- - - 发行版 - { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}} - - {/* { - baseOperate && projectType !==2 && 新建 - } */} - + 发行版 + { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}} + { releaseVersions && releaseVersions.total_count>0 ? releaseVersions.list.map((item,key)=>{ diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index f03ae30c..229c0a5a 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -209,7 +209,7 @@ function CoderDepot(props){ let b = branchName || defaultBranch; let checkvalue = turnbar(b); return ( - + urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件 @@ -354,13 +354,15 @@ function CoderDepot(props){ - 分支{projectDetail && projectDetail.branches && projectDetail.branches.total_count} + 分支 + {projectDetail && projectDetail.branches && projectDetail.branches.total_count} - 标签{projectDetail && projectDetail.tags && projectDetail.tags.total_count} + 标签 + {projectDetail && projectDetail.tags && projectDetail.tags.total_count} @@ -379,8 +381,13 @@ function CoderDepot(props){
} { fileOperate && - - + + 文件 } @@ -404,8 +411,8 @@ function CoderDepot(props){ {lastCommit.time_from_now} { commitCount ? - - {commitCount}次提交 + + {commitCount}次提交 :"" }
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index e43a7d22..0062d79a 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -14,16 +14,15 @@ } } .iconBtn{ - color: #666; i{ - margin-right: 4px; + color: #666; } span{ margin-left: 4px; - color: #333; + color: #333!important; } - &:hover span{ - color: #466AFF; + &:hover span,&:hover i{ + color: #466AFF!important; } } /* recommandProjects */ @@ -144,14 +143,15 @@ .ant-btn-primary{ color: #fff; background-color: #466AFF; + border-color: #466AFF; } } } - .addOptionBtn{ + .depotBtn,.addOptionBtn{ display: flex; a{ color: #333!important; - font-weight: 500; + font-weight: 500!important; border-radius: 5px; width: 83px; height: 32px; @@ -196,15 +196,15 @@ } .progress{ display: flex; - border-radius: 10px; - height: 7px; + border-radius: 2px; + height: 11px; margin-top: 12px; span{ &:first-child{ - border-radius: 10px 0px 0px 10px; + border-radius: 2px 0px 0px 2px; } &:last-child{ - border-radius: 0px 10px 10px 0px; + border-radius: 0px 2px 2px 0px; } } } @@ -383,6 +383,14 @@ line-height: 50px; } } +.fileMenu{ + width: 83px; + li{ + padding:6px 0px!important; + text-align: center; + width: 100%; + } +} .catelogue{ cursor: pointer; @@ -417,7 +425,7 @@ .pinfos{ i,a{color: #666;} &:hover i,&:hover a{ - color: #2A61FF; + color: #2A61FF!important; } } .graph{ diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index 8b76507d..5641ee6d 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -236,10 +236,8 @@ height: 36px; line-height: 24px; display: block; - color: #666; - &> img{ - margin-right: 8px; - } + color: #000!important; + font-weight: 500; } &> span.num{ line-height: 24px; @@ -252,9 +250,7 @@ width: 24px; height: 24px; } - &.active a,&.active a i{ - color: #466AFF!important; - } + &.active a::after,&:hover a::after{ position: absolute; bottom:0px; diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 355f0ea4..d6bdaf26 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -30,7 +30,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa item.menu_name === "home" &&
  • - + 主页
    • @@ -39,7 +39,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa item.menu_name === "code" &&
  • - + 代码库
    • @@ -49,7 +49,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
  • - + 易修 @@ -60,7 +60,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa item.menu_name === "pulls" && projectDetail && parseInt(projectDetail.type) !== 2 && platform ?
  • - + 合并请求 {projectDetail && projectDetail.pull_requests_count ? {numFormat(projectDetail.pull_requests_count)} : ""} @@ -70,7 +70,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa item.menu_name === "wiki" &&
  • - + Wiki
    • @@ -80,7 +80,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
  • {/* */} - 工作流(beta版) + 工作流(beta版) {projectDetail && projectDetail.ops_count ? {projectDetail.ops_count} : ""}