diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx index 5d3480189..84220a0bb 100644 --- a/src/forge/Main/tree/Index.jsx +++ b/src/forge/Main/tree/Index.jsx @@ -67,11 +67,14 @@ function Index(props) { last_commit && last_commit.committer && last_commit.committer.id? + {last_commit && last_commit.committer && last_commit.committer.name} : - + + + {last_commit && last_commit.committer && last_commit.committer.name} + } - {last_commit && last_commit.committer && last_commit.committer.name} 更新于{last_commit && last_commit.time_from_now} diff --git a/src/forge/Main/tree/Index.scss b/src/forge/Main/tree/Index.scss index 30c2fce7b..b077d9de9 100644 --- a/src/forge/Main/tree/Index.scss +++ b/src/forge/Main/tree/Index.scss @@ -26,7 +26,9 @@ flex:1; flex-direction: column; a:hover{ - text-decoration: underline; + span{ + color: #466AFF!important; + } } img{ height: 20px; diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js index 9b7769552..953f50720 100644 --- a/src/forge/Newfile/Index.js +++ b/src/forge/Newfile/Index.js @@ -65,16 +65,18 @@ class Index extends Component { - +
+ +
diff --git a/src/forge/Newfile/index.css b/src/forge/Newfile/index.css index feb82b97a..746febe55 100644 --- a/src/forge/Newfile/index.css +++ b/src/forge/Newfile/index.css @@ -8,7 +8,13 @@ border: 1px solid #d9d9d9!important; border-right: none!important; } - +.editorBorder .editorBorderBox{ + border:1px solid #eee; + border-radius: 2px; +} +.editorBorder .editorBorderSubmitBox{ + padding:20px 0px!important; +} .userScrew{ margin:20px 0px; border:1px solid #f4f4f4; diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js index 967717c9b..242f7e0d3 100644 --- a/src/forge/Newfile/m_editor.js +++ b/src/forge/Newfile/m_editor.js @@ -69,10 +69,12 @@ class m_editor extends Component { ); const lineCount = editor.getModel().getLineCount() || 1; - const height = + let height = editor.getTopForLineNumber(lineCount + 1) + lineHeight + - padding; + padding ; + + if(height<400){height = 400;} if (this.state.prevHeight !== height) { this.setState({ @@ -89,36 +91,32 @@ class m_editor extends Component { return ( - - -
-
- -
- {!readOnly && ( -
- -
- )} -
+
+ +
+ {!readOnly && ( +
+ +
+ )}
); } diff --git a/src/forge/Team/New.jsx b/src/forge/Team/New.jsx index a6f567ebc..46e13c3e0 100644 --- a/src/forge/Team/New.jsx +++ b/src/forge/Team/New.jsx @@ -87,7 +87,7 @@ export default Form.create()( } ], )}