diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 6422a04c..5f210e9d 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -233,12 +233,12 @@ class NewMerge extends Component {
-
+
源分支:
@@ -258,13 +258,13 @@ class NewMerge extends Component { className={"iconfont icon-youjiang color-grey-c font-32"} >
-
+
目标分支:
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css index b962e886..f66d1025 100644 --- a/src/forge/Merge/merge.css +++ b/src/forge/Merge/merge.css @@ -47,6 +47,12 @@ form .ant-cascader-picker, form .ant-select { .width30{ width:30%; } +.width40{ + width:40%; +} +.display-flex{ + display: flex!important; +} .w120{ width: 120px; }