1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-28 03:10:45 +00:00

Merge branch 'master' into 13.0

This commit is contained in:
Michael An 2025-02-27 13:25:57 +08:00
commit 32a1639aca
2 changed files with 8 additions and 4 deletions

View File

@ -300,8 +300,7 @@ class DirOperationToolbar extends React.Component {
onKeyDown={this.onDropdownToggleKeyDown}
data-toggle="dropdown"
>
{this.props.children}
<i className="sf3-font-new sf3-font ml-2"></i>
<i className="sf3-font-new sf3-font"></i>
<i className="sf3-font-down sf3-font path-item-dropdown-toggle"></i>
</DropdownToggle>
<DropdownMenu onMouseMove={this.onDropDownMouseMove} className='position-fixed'>
@ -359,8 +358,7 @@ class DirOperationToolbar extends React.Component {
role="button"
className="path-item"
>
{this.props.children}
<i className="sf3-font-new sf3-font ml-2"></i>
<i className="sf3-font-new sf3-font"></i>
<i className="sf3-font-down sf3-font path-item-dropdown-toggle"></i>
</DropdownToggle>
<DropdownMenu className='position-fixed'>
@ -382,6 +380,7 @@ class DirOperationToolbar extends React.Component {
<Fragment>
{isShowDropdownMenu && (
<div className="dir-operation">
{this.props.children}
{content}
</div>
)}

View File

@ -280,6 +280,11 @@
align-items: center;
}
.dir-view-path .dir-operation>.path-repo-name,
.dir-view-path .dir-operation>.path-file-name {
margin: 0 6px;
}
.dir-view-path .dir-operation.dir-operation-no-dropdown {
margin-left: 6px;
}