diff --git a/public/css/merge.css b/public/css/merge.css
index 89e234b2..c72b582a 100755
--- a/public/css/merge.css
+++ b/public/css/merge.css
@@ -1,169 +1,3 @@
-/* .CodeMirror-merge {
- position: relative;
- white-space: pre;
-}
-
-.CodeMirror-merge,
-.CodeMirror-merge .CodeMirror {
- min-height: 50px;
-}
-
-.CodeMirror-merge-2pane .CodeMirror-merge-pane {
- width: 48%;
-}
-
-.CodeMirror-merge-2pane .CodeMirror-merge-gap {
- width: 4%;
-}
-
-.CodeMirror-merge-3pane .CodeMirror-merge-pane {
- width: 31%;
-}
-
-.CodeMirror-merge-3pane .CodeMirror-merge-gap {
- width: 3.5%;
-}
-
-.CodeMirror-merge-pane {
- display: inline-block;
- white-space: normal;
- vertical-align: top;
-}
-
-.CodeMirror-merge-pane-rightmost {
- position: absolute;
- right: 0px;
- z-index: 1;
-}
-
-.CodeMirror-merge-gap {
- z-index: 2;
- display: inline-block;
- height: 100%;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- overflow: hidden;
- position: relative;
- background: #515151;
-}
-
-.CodeMirror-merge-scrolllock-wrap {
- position: absolute;
- bottom: 0;
- left: 50%;
-}
-
-.CodeMirror-merge-scrolllock {
- position: relative;
- left: -50%;
- cursor: pointer;
- color: #d8d8d8;
- line-height: 1;
-}
-
-.CodeMirror-merge-copybuttons-left,
-.CodeMirror-merge-copybuttons-right {
- position: absolute;
- left: 0;
- top: 0;
- right: 0;
- bottom: 0;
- line-height: 1;
-}
-
-.CodeMirror-merge-copy {
- position: absolute;
- cursor: pointer;
- color: #ce374b;
- z-index: 3;
-}
-
-.CodeMirror-merge-copy-reverse {
- position: absolute;
- cursor: pointer;
- color: #44c;
-}
-
-.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy {
- left: 2px;
-}
-
-.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy {
- right: 2px;
-}
-
-.CodeMirror-merge-r-inserted,
-.CodeMirror-merge-l-inserted {
- background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
- background-position: bottom left;
- background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-deleted,
-.CodeMirror-merge-l-deleted {
- background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
- background-position: bottom left;
- background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-chunk {
- background: #9a6868;
-}
-
-.CodeMirror-merge-r-connect {
- fill: #9a6868;
-}
-
-.CodeMirror-merge-l-chunk {
- background: #eef;
-}
-
-.CodeMirror-merge-l-chunk-start {
- border-top: 1px solid #88e;
-}
-
-.CodeMirror-merge-l-chunk-end {
- border-bottom: 1px solid #88e;
-}
-
-.CodeMirror-merge-l-connect {
- fill: #eef;
- stroke: #88e;
- stroke-width: 1px;
-}
-
-.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk {
- background: #dfd;
-}
-
-.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start {
- border-top: 1px solid #4e4;
-}
-
-.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end {
- border-bottom: 1px solid #4e4;
-}
-
-.CodeMirror-merge-collapsed-widget:before {
- content: "(...)";
-}
-
-.CodeMirror-merge-collapsed-widget {
- cursor: pointer;
- color: #88b;
- background: #eef;
- border: 1px solid #ddf;
- font-size: 90%;
- padding: 0 3px;
- border-radius: 4px;
-}
-
-.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt {
- display: none;
-}
-.color-grey {
- color: #888 !important;
-} */
.maxW50{max-width: 50%;}
.minW50{min-width: 50%;}
@@ -193,4 +27,6 @@
.ant-btn-success:hover{
background: #28BD6C !important;
color:#fff !important;
-}
\ No newline at end of file
+}
+.display-flex{display: flex !important;}
+.merge-flex1{flex:1}
\ No newline at end of file
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 3299fdb0..d94d50e6 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -100,7 +100,7 @@ export function initAxiosInterceptors(props) {
// TODO 读取到package.json中的配置？
var proxy = "http://localhost:3000"
// proxy = "https://pre-newweb.educoder.net"
- // proxy = "https://testforgeplus.trustie.net/"
+ proxy = "https://testforgeplus.trustie.net/"
// 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
// 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 40fa5a35..97abcc6f 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -167,7 +167,6 @@ class MessageCount extends Component {
});
};
-
getOption = (e) => {
if (e.key === "rebase") {
this.setState({
@@ -199,7 +198,6 @@ class MessageCount extends Component {
return ;
};
-
render() {
const { projectsId, mergeId } = this.props.match.params;
const {
@@ -212,7 +210,6 @@ class MessageCount extends Component {
} = this.state;
const { current_user } = this.props;
-
const menu = (