Eeeros
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

样式覆盖’

This commit is contained in:
caishi 2026-01-21 10:45:32 +08:00
parent 79e4f1db2a
commit 40e859aa41
7 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/css/detail.css
View File

File diff suppressed because one or more lines are too long

2
src/forge/Issues/Component/chooseMenu.jsx
View File

@ -130,7 +130,7 @@ function ChooseMenu({
<span className={"task-hide"}>{i.name}</span> <span className={"task-hide"}>{i.name}</span>
} }
{ !colorFlag && removeFlag && <a className="removeicon" onClick={()=>removeValueFunc(i.id)}><i className="iconfont icon-shanchu8 font-14"></i></a>} { !colorFlag && removeFlag && <a className="removeicon" onClick={()=>removeValueFunc(i.id)}><i className="iconfont icon-shanchu8 font-14"></i></a>}
{ colorFlag && removeFlag && <a className="removeicon" onClick={()=>removeValueFunc(i.id)} style={{display:'block',right:"19px",position:"absolute"}}><i className="iconfont icon-guanbi font-12 color-white"></i></a>} { colorFlag && removeFlag && <a className="removeicon" onClick={()=>removeValueFunc(i.id)} style={{display:'block',right:"4px",position:"absolute"}}><i className="iconfont icon-guanbi font-12 color-white"></i></a>}
</p> </p>
) )
}) })

1
src/forge/Issues/index.scss
View File

@ -494,6 +494,7 @@ li.dropliComponent{
&>p{ &>p{
margin-top: 5px!important; margin-top: 5px!important;
position: relative; position: relative;
margin-right: 15px;
&.removeFlag>span{ &.removeFlag>span{
max-width: 230px; max-width: 230px;
} }

2
src/forge/Main/Index.scss
View File

@ -511,7 +511,7 @@
} }
} }
.coderSubPage{ .coderSubPage{
width: 1200px; width: 1400px;
margin:0px auto; margin:0px auto;
} }
.griditemAnchor{ .griditemAnchor{

2
src/forge/Main/version/version.scss
View File

@ -332,7 +332,7 @@
} }
.releaseIndex{ .releaseIndex{
margin: 30px auto; margin: 30px auto;
width: 1200px; width: 1400px;
} }
.emptyPanel{ .emptyPanel{
width: 100%; width: 100%;

2
src/forge/Merge/MessageCount.js
View File

@ -528,7 +528,7 @@ class MessageCount extends Component {
{ {
pr_status === 2 && permission && <Button type="primary" ghost onClick={this.restartFunc}>重新开启</Button> pr_status === 2 && permission && <Button type="primary" ghost onClick={this.restartFunc}>重新开启</Button>
} }
{(userLogin && projectDetail && (pr_status === 0 || pr_status === 2) && permission) && ( {(userLogin && projectDetail && (pr_status === 0 || pr_status === 1) && permission) && (
<Button <Button
type="green" type="green"
ghost ghost

1
src/forge/Merge/UpdateMerge.js
View File

@ -75,7 +75,6 @@ class UpdateMerge extends Component {
<div className="merge-header width100 inline-block"> <div className="merge-header width100 inline-block">
<div className="width45 pull-left"> <div className="width45 pull-left">
<div className="color-grey-3 mb10 fwb">源分支 : </div> <div className="color-grey-3 mb10 fwb">源分支 : </div>
<Input.Group compact className="display-flex"> <Input.Group compact className="display-flex">
<Button className="merge-header-button flex1 maxW50 hide-1 task-hide" disabled> <Button className="merge-header-button flex1 maxW50 hide-1 task-hide" disabled>
{data.is_original ? `${data.fork_project_user_name}/${data.fork_project_identifier}` : `${data.project_author}/${data.project_name}`} {data.is_original ? `${data.fork_project_user_name}/${data.fork_project_identifier}` : `${data.project_author}/${data.project_name}`}