diff --git a/frontend/src/components/common/seahub-modal-close.js b/frontend/src/components/common/seahub-modal-close.js index c7023fefb6..2d6631b14e 100644 --- a/frontend/src/components/common/seahub-modal-close.js +++ b/frontend/src/components/common/seahub-modal-close.js @@ -4,7 +4,7 @@ import '../../css/seahub-modal-header.css'; const SeahubModalCloseIcon = (props) => { return ( - {(isPro && !showSearchBar) && - {(isPro && !showSearchBar) && - } {isDesktop && ( - } @@ -983,6 +984,7 @@ class Search extends Component { className="search-icon-right input-icon-addon sf3-font sf3-font-x-01" onClick={this.onClearSearch} aria-label={gettext('Clear search')} + title={gettext('Clear search')} > } diff --git a/frontend/src/components/share-link-panel/link-item.js b/frontend/src/components/share-link-panel/link-item.js index 929dc709e6..2f674ff44e 100644 --- a/frontend/src/components/share-link-panel/link-item.js +++ b/frontend/src/components/share-link-panel/link-item.js @@ -155,7 +155,7 @@ class LinkItem extends React.Component { onChange={this.toggleSelectLink} /> - + {this.cutLink(link)} diff --git a/frontend/src/css/lib-content-view.css b/frontend/src/css/lib-content-view.css index 16fadf8e0a..75f42f6d4e 100644 --- a/frontend/src/css/lib-content-view.css +++ b/frontend/src/css/lib-content-view.css @@ -261,12 +261,12 @@ .dir-view-path .path-item, .dir-view-path .last-path-item { display: inline-block; - min-width: 0; /* overwrite some styles */ padding: 0 6px; font-size: 1rem; color: inherit; border-radius: 3px; text-decoration: none; + min-width: 28px; max-width: 172px; overflow: hidden; text-overflow: ellipsis; diff --git a/frontend/src/metadata/components/metadata-details/settings-icon.js b/frontend/src/metadata/components/metadata-details/settings-icon.js index ffaa101dae..2ae0606df6 100644 --- a/frontend/src/metadata/components/metadata-details/settings-icon.js +++ b/frontend/src/metadata/components/metadata-details/settings-icon.js @@ -1,4 +1,5 @@ import React, { useMemo, useCallback, useState } from 'react'; +import { gettext } from '../../../utils/constants'; import Icon from '../../../components/icon'; import HideColumnPopover from '../popover/hidden-column-popover'; import { useMetadataDetails } from '../../hooks'; @@ -21,7 +22,7 @@ const SettingsIcon = () => { return ( <> -
+
{isShowSetter && ( diff --git a/frontend/src/pages/lib-content-view/lib-content-view.js b/frontend/src/pages/lib-content-view/lib-content-view.js index acf2bd02cb..63be61d771 100644 --- a/frontend/src/pages/lib-content-view/lib-content-view.js +++ b/frontend/src/pages/lib-content-view/lib-content-view.js @@ -2442,6 +2442,7 @@ class LibContentView extends React.Component { sortOrder={this.state.sortOrder} sortItems={this.sortItems} toggleTreePanel={this.toggleTreePanel} + isTreePanelShown={this.state.isTreePanelShown} enableDirPrivateShare={enableDirPrivateShare} showShareBtn={showShareBtn} onUploadFile={this.onUploadFile} diff --git a/frontend/src/pages/wiki2/wiki-trash-dialog.js b/frontend/src/pages/wiki2/wiki-trash-dialog.js index 42ee73232e..99ed020fd7 100644 --- a/frontend/src/pages/wiki2/wiki-trash-dialog.js +++ b/frontend/src/pages/wiki2/wiki-trash-dialog.js @@ -97,7 +97,7 @@ class WikiTrashDialog extends React.Component { {(isAdmin && enableUserCleanTrash) && } -