diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 603513339..1ec104461 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -1949,9 +1949,7 @@ a.decoration { } .mr20 { - margin-right: 10px; - margin-left: 10px; - float: left; + margin-right: 20px; } .mr25 { @@ -1959,7 +1957,7 @@ a.decoration { } .mr30 { - margin-right: 10px; + margin-right: 30px; } .mr35 { diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx index f043a8f52..e9c4aae4f 100644 --- a/src/forge/Branch/SelectOverlay.jsx +++ b/src/forge/Branch/SelectOverlay.jsx @@ -53,8 +53,10 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne setIsSpin(true); if(e.key === "branch"){ getBranchs(projectsId,owner); + setNav(0); }else{ getTags(projectsId,owner); + setNav(1); } } diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index c86e31d94..f2e4e149a 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -402,7 +402,7 @@ function CoderDepot(props){ getPathUrl={getPathUrl} /> : -
+ @@ -417,7 +417,7 @@ function CoderDepot(props){ {projectDetail && projectDetail.tags && projectDetail.tags.total_count} -
+ } diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx index 045500615..6556023e3 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -91,7 +91,7 @@ export default (props) => { {commit && commit.message && } - {data.branch} + {data.branch} diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index a177ccc79..4ec6a7cb6 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -195,7 +195,7 @@ width: 40px; height: 40px; } - &:nth-child(5){ + &:nth-child(5n){ margin-right: 0px; } } @@ -271,8 +271,10 @@ word-wrap:break-word; .markdown-body{ line-height: 10px; + font-size: 14px; & p { - margin: 0px 0px !important; + margin: 1px 0px 0px !important; + font-size: 14px !important; } & ol,ul{ padding-bottom: 3px; diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx index 6a111b454..0fd40b1f4 100644 --- a/src/forge/Main/tag/Index.jsx +++ b/src/forge/Main/tag/Index.jsx @@ -119,19 +119,19 @@ function Tags(props) { return(
-
- - { - source && source.length > 0 && -
- } - { - source && source.length === 0 && - } -
-
+ +
+ { + source && source.length > 0 && +
+ } + { + source && source.length === 0 && + } +
+
) } diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss index 70e83a837..6adba91e3 100644 --- a/src/forge/Main/tag/Index.scss +++ b/src/forge/Main/tag/Index.scss @@ -39,10 +39,6 @@ } .tagSpin{ min-height: 300px; - text-align: center; - display: flex; - align-items: center; - justify-content: center; } .tagBranch{ padding-right: 15px; diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index b1af2f998..ec9f80c83 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -153,15 +153,20 @@ class Setting extends Component { name: values.project_name, description: values.project_description, private: private_check, + identifier:values.project_identifier, ...values, }).then((result) => { if (result) { - this.props.showNotification(`仓库信息修改成功!`); - const { getDetail } = this.props; - getDetail && getDetail(); this.setState({ loading:false }) + this.props.showNotification(`仓库信息修改成功!`); + // if(values.project_identifier !== projectsId){ + // this.props.history.push(`/${owner}/${values.project_identifier}/settings`); + // }else{ + // } + const { getDetail } = this.props; + getDetail && getDetail(); } }).catch((error) => { console.log(error); @@ -283,6 +288,18 @@ class Setting extends Component { )} + {/* + {getFieldDecorator("project_identifier", { + rules: [ + { + required: true, + message: "请输入项目标识", + }, + ], + })( + + )} + */} {getFieldDecorator("project_description", { rules: [],