Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request '合并请求页面查看文件样式' (#125) from durian/forgeplus-react:feature_repo_second_page_xiesi1 into pre_develop_dev

This commit is contained in:
jasder 2021-10-09 18:03:54 +08:00
parent 170977432e 9be6116cb8
commit c73b1c9e29
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/Merge/merge.css
View File

@ -208,4 +208,8 @@ form .ant-cascader-picker, form .ant-select {
} }
.linesContent.add{ .linesContent.add{
background: rgba(48, 232, 132, 0.15); background: rgba(48, 232, 132, 0.15);
} }
.mergeRequest .folders{
width: 72rem;
}

2
src/forge/Merge/merge_footer.js
View File

@ -119,7 +119,7 @@ class MergeFooter extends Component {
return ( return (
!footer_type && !comparesData || (comparesData && ((comparesData.commits && comparesData.commits.length===0)||(comparesData && !comparesData.diff)) )?"": !footer_type && !comparesData || (comparesData && ((comparesData.commits && comparesData.commits.length===0)||(comparesData && !comparesData.diff)) )?"":
<div className="main" style={{paddingTop:"0px"}}> <div className="main mergeRequest" style={{paddingTop:"0px"}}>
<Spin spinning={isSpin}> <Spin spinning={isSpin}>
<Tabs <Tabs
activeKey={activeKey} activeKey={activeKey}