haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 14:42:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 13.0

Browse Source
This commit is contained in:
Michael An
2025-02-27 13:25:57 +08:00
parent b499dd87cc a3a609d89d
commit 32a1639aca
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/components/toolbar/dir-operation-toolbar.js
View File

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

5
frontend/src/css/lib-content-view.css
View File

@@ -280,6 +280,11 @@
align-items: center; 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 { .dir-view-path .dir-operation.dir-operation-no-dropdown {
margin-left: 6px; margin-left: 6px;
} }