From 9be6116cb823d434c25898658f243b6d7c6ef0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Sat, 9 Oct 2021 18:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E7=9C=8B=E6=96=87=E4=BB=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/merge.css | 6 +++++- src/forge/Merge/merge_footer.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css index 088874c1..d5ce68d1 100644 --- a/src/forge/Merge/merge.css +++ b/src/forge/Merge/merge.css @@ -208,4 +208,8 @@ form .ant-cascader-picker, form .ant-select { } .linesContent.add{ background: rgba(48, 232, 132, 0.15); -} \ No newline at end of file +} + +.mergeRequest .folders{ + width: 72rem; + } \ No newline at end of file diff --git a/src/forge/Merge/merge_footer.js b/src/forge/Merge/merge_footer.js index 6502827c..5e3a7556 100644 --- a/src/forge/Merge/merge_footer.js +++ b/src/forge/Merge/merge_footer.js @@ -119,7 +119,7 @@ class MergeFooter extends Component { return ( !footer_type && !comparesData || (comparesData && ((comparesData.commits && comparesData.commits.length===0)||(comparesData && !comparesData.diff)) )?"": -