From 06f3eacb9db31525aa36ae3d7fe5f4f84817ff98 Mon Sep 17 00:00:00 2001 From: caishi Date: Thu, 9 Sep 2021 17:50:46 +0800 Subject: [PATCH] style --- src/forge/Main/CoderDepot.jsx | 14 ++++++------ src/forge/Main/Detail.js | 2 +- src/forge/Main/Index.scss | 40 ++++++++++++++++++++++------------ src/forge/Main/list.scss | 2 +- src/images/add.png | Bin 0 -> 136 bytes 5 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 src/images/add.png diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 24f424147..f03ae30c7 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -352,22 +352,22 @@ 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} { baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&& -
+
{ projectDetail.type !== 2 && pullsFlag && urlLink(`/${owner}/${projectsId}/pulls/new`)} >+ 合并请求 diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 94265719a..190bf1d61 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -474,7 +474,7 @@ class Detail extends Component {
- +
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index f42bfce2f..e43a7d223 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -13,6 +13,19 @@ } } } +.iconBtn{ + color: #666; + i{ + margin-right: 4px; + } + span{ + margin-left: 4px; + color: #333; + } + &:hover span{ + color: #466AFF; + } +} /* recommandProjects */ .recommandProjects.slick-slider{ width: 1230px; @@ -129,28 +142,27 @@ } } .ant-btn-primary{ - width: 88px; color: #fff; background-color: #466AFF; } } } .addOptionBtn{ - height: 32px; - line-height: 30px; display: flex; - border:1px solid #d9d9d9; - border-radius: 2px; a{ - padding:0px 13px; - color: rgba(0, 0, 0, 0.65); - cursor: pointer; - } - & > a:first-child{ - border-right: 1px solid #d9d9d9; - } - & > a:last-child{ - border-right: none; + color: #333!important; + font-weight: 500; + border-radius: 5px; + width: 83px; + height: 32px; + line-height: 30px; + background: #fff; + border: 1px solid #D0D0D0; + margin-right: 10px; + text-align: center; + &:hover,&:active{ + background: #F3F4F6; + } } } .infoCount{ diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index 8ab94e46e..8b76507d9 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -356,7 +356,7 @@ .gitAddressClone{ - margin:0px 20px 14px 20px!important; + margin:14px 20px!important; display: flex; height: 40px; align-items: center; diff --git a/src/images/add.png b/src/images/add.png new file mode 100644 index 0000000000000000000000000000000000000000..6a1f55eb961b630d6cfd19fa4f78bd0b35a3b2d3 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|oIG6|Lo|Yu zQyiF%9Xl4N@b2d3^yvp%BqxeWNJ=hk{PFzU+}W;sm?mue|NsB<##b9!FSR?GC@Vh} icWdI(C}&p8XJUw0sQjM)h|mV0X$+pOelF{r5}E*v7cJ5N literal 0 HcmV?d00001