diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js
index 99eaa33..a053855 100644
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@@ -143,11 +143,11 @@ class Activity extends Component{
-
{data && data.pr_count}
- this.changeTrends("PullRequest","close")}>已处理的合并请求
+ this.changeTrends("PullRequest","delay")}>已处理的合并请求
-
{data && data.new_pr_count}
- this.changeTrends("PullRequest","create")}>未处理的合并请求
+ this.changeTrends("PullRequest","not_delay")}>未处理的合并请求
-
{data && data.close_issues_count}
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 4ec6a7c..5f36929 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -480,7 +480,7 @@
}
}
.ant-anchor-wrapper{
- padding-left: 2px;
+ padding-left: 2px!important;
.ant-anchor-ink::before{
background-color: #fff;
}
@@ -490,8 +490,8 @@
margin:0px auto;
}
.griditemAnchor{
- margin-left: 0px;
- padding: 0px;
+ margin-left: 0px!important;
+ padding: 0px!important;
border-bottom: 1px solid #ddd;
.ant-anchor{
display: flex;
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 242f7e0..13d2ec4 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -1,5 +1,7 @@
import React, { Component } from "react";
import Editor from "react-monaco-editor";
+// import {UnControlled as CodeMirror} from 'react-codemirror2'
+
import UserSubmitComponent from "./UserSubmitComponent";
import "./index.css";
@@ -103,6 +105,17 @@ class m_editor extends Component {
editorWillMount={this.editorWillMount}
editorDidMount={handleEditorMount}
/>
+ {/* */}
{!readOnly && (