diff --git a/frontend/src/assets/icons/drop-down.svg b/frontend/src/assets/icons/drop-down.svg deleted file mode 100644 index 7222fa9f16..0000000000 --- a/frontend/src/assets/icons/drop-down.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - -drop-down - - - - - - diff --git a/frontend/src/assets/icons/left-slide.svg b/frontend/src/assets/icons/left-slide.svg deleted file mode 100644 index e2e99eebf7..0000000000 --- a/frontend/src/assets/icons/left-slide.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -left-slide - - - - - - - diff --git a/frontend/src/assets/icons/right-slide.svg b/frontend/src/assets/icons/right-slide.svg deleted file mode 100644 index 452c82f40c..0000000000 --- a/frontend/src/assets/icons/right-slide.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -right-slide - - - - - - - diff --git a/frontend/src/assets/icons/upward.svg b/frontend/src/assets/icons/upward.svg deleted file mode 100644 index c6cdab3e60..0000000000 --- a/frontend/src/assets/icons/upward.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -upward - - - - - - - diff --git a/frontend/src/components/dialog/extra-attributes-dialog/editor/single-select/index.css b/frontend/src/components/dialog/extra-attributes-dialog/editor/single-select/index.css index 9b4279f077..cee008435e 100644 --- a/frontend/src/components/dialog/extra-attributes-dialog/editor/single-select/index.css +++ b/frontend/src/components/dialog/extra-attributes-dialog/editor/single-select/index.css @@ -22,11 +22,6 @@ cursor: pointer; } -.extra-attributes-dialog .selected-single-select-container .fa-caret-down { - font-size: 16px; - color: #949494; -} - .extra-attributes-dialog .selected-single-select-container .single-select-option { text-align: center; width: min-content; diff --git a/frontend/src/components/dialog/extra-attributes-dialog/editor/single-select/index.js b/frontend/src/components/dialog/extra-attributes-dialog/editor/single-select/index.js index 2934977a00..018a0500b3 100644 --- a/frontend/src/components/dialog/extra-attributes-dialog/editor/single-select/index.js +++ b/frontend/src/components/dialog/extra-attributes-dialog/editor/single-select/index.js @@ -55,7 +55,7 @@ class SingleSelect extends Component { )} {column.editable && ( - + )} diff --git a/frontend/src/components/dialog/tag-color.js b/frontend/src/components/dialog/tag-color.js index 890e6a5970..e2998dab31 100644 --- a/frontend/src/components/dialog/tag-color.js +++ b/frontend/src/components/dialog/tag-color.js @@ -71,7 +71,7 @@ class TagColor extends React.Component { style={{backgroundColor: tagColor}} onClick={this.togglePopover} > - + : ; + const sortIcon = sortOrder == 'asc' ? : ; const isDesktop = Utils.isDesktop(); diff --git a/frontend/src/components/file-chooser/file-chooser.js b/frontend/src/components/file-chooser/file-chooser.js index e32fa7ea0e..0917752c6b 100644 --- a/frontend/src/components/file-chooser/file-chooser.js +++ b/frontend/src/components/file-chooser/file-chooser.js @@ -378,7 +378,7 @@ class FileChooser extends React.Component {
- + {gettext('Current Library')}
{ @@ -399,7 +399,7 @@ class FileChooser extends React.Component {
- + {gettext('Other Libraries')}
{ @@ -423,7 +423,7 @@ class FileChooser extends React.Component {
{!this.props.hideLibraryName &&
- + {gettext('Current Library')}
} @@ -449,7 +449,7 @@ class FileChooser extends React.Component {
- + {gettext('Libraries')}
{this.props.repo.repo_name}
- + diff --git a/frontend/src/components/file-chooser/tree-list-item.js b/frontend/src/components/file-chooser/tree-list-item.js index 4bf3ed7677..0e300eabdf 100644 --- a/frontend/src/components/file-chooser/tree-list-item.js +++ b/frontend/src/components/file-chooser/tree-list-item.js @@ -107,7 +107,7 @@ class TreeViewItem extends React.Component {
{ node.object.type !== 'file' && - + } diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js index 295045843f..e38eeca985 100644 --- a/frontend/src/components/main-side-nav.js +++ b/frontend/src/components/main-side-nav.js @@ -224,7 +224,7 @@ class MainSideNav extends React.Component { this.tabItemClick(e, 'libraries')}> {gettext('Files')} - +
    {canAddRepo && ( @@ -285,7 +285,7 @@ class MainSideNav extends React.Component { {gettext('Share Admin')} - + {this.renderSharedAdmin()} diff --git a/frontend/src/components/popover/virtual-tag-color.js b/frontend/src/components/popover/virtual-tag-color.js index 2ffe4fc9b0..2fd67ac01a 100644 --- a/frontend/src/components/popover/virtual-tag-color.js +++ b/frontend/src/components/popover/virtual-tag-color.js @@ -63,7 +63,7 @@ export default class VirtualTagColor extends React.Component { style={{backgroundColor: tagColor}} onClick={this.togglePopover} > - + {e.stopPropagation();}} > {this.translateMenuItem(item)} + {advancedOperations.map((item, index)=> { diff --git a/frontend/src/components/shared-repo-list-view/shared-repo-list-view.js b/frontend/src/components/shared-repo-list-view/shared-repo-list-view.js index e69ff9abbe..bc4fe7e808 100644 --- a/frontend/src/components/shared-repo-list-view/shared-repo-list-view.js +++ b/frontend/src/components/shared-repo-list-view/shared-repo-list-view.js @@ -59,7 +59,7 @@ class SharedRepoListView extends React.Component { sortByName: this.props.sortBy == 'name', sortByTime: this.props.sortBy == 'time', sortBySize: this.props.sortBy == 'size', - sortIcon: this.props.sortOrder == 'asc' ? : + sortIcon: this.props.sortOrder == 'asc' ? : }; }; diff --git a/frontend/src/components/single-selector.js b/frontend/src/components/single-selector.js index de6d0f5d47..2eab4daa13 100644 --- a/frontend/src/components/single-selector.js +++ b/frontend/src/components/single-selector.js @@ -74,7 +74,7 @@ class Selector extends Component { {customSelectorToggle ? customSelectorToggle : ( {currentSelectedOption.text} - {isDropdownToggleShown && } + {isDropdownToggleShown && } )}
diff --git a/frontend/src/components/toolbar/dir-operation-toolbar.js b/frontend/src/components/toolbar/dir-operation-toolbar.js index 51a7ef69cd..1a77a3e569 100644 --- a/frontend/src/components/toolbar/dir-operation-toolbar.js +++ b/frontend/src/components/toolbar/dir-operation-toolbar.js @@ -234,7 +234,7 @@ class DirOperationToolbar extends React.Component { data-toggle="dropdown" > {this.props.children} - + {opList.map((item, index)=> { @@ -251,13 +251,13 @@ class DirOperationToolbar extends React.Component { onMouseMove={(e) => {e.stopPropagation();}} > {item.text} + {item.subOpList.map((item, index)=> { diff --git a/frontend/src/components/toolbar/single-dropdown-toolbar.js b/frontend/src/components/toolbar/single-dropdown-toolbar.js index af26ba214c..3850ff0275 100644 --- a/frontend/src/components/toolbar/single-dropdown-toolbar.js +++ b/frontend/src/components/toolbar/single-dropdown-toolbar.js @@ -40,7 +40,7 @@ class SingleDropdownToolbar extends React.Component { {this.props.children} - + {opList.map((item, index)=> { @@ -173,12 +173,12 @@ class ViewFileToolbar extends React.Component { onMouseMove={(e) => {e.stopPropagation();}} > {item.text} + {item.subOpList.map((item, index)=> { diff --git a/frontend/src/components/tree-section/index.css b/frontend/src/components/tree-section/index.css index 9658a94360..35d6430792 100644 --- a/frontend/src/components/tree-section/index.css +++ b/frontend/src/components/tree-section/index.css @@ -56,14 +56,9 @@ border-radius: 3px; } -.tree-section .tree-section-header .sf3-font-drop-down { +.tree-section .tree-section-header .sf3-font-down { font-size: 12px; - color: #999; - transform: scale(.8); -} - -.tree-section .tree-section-header .sf3-font-drop-down.icon-rotate-90 { - transform: rotate(90deg) scale(.8); + color: #666666; } .tree-section .tree-section-header-operation .dropdown { diff --git a/frontend/src/components/tree-section/index.js b/frontend/src/components/tree-section/index.js index 42cb6b2948..24f0d077e4 100644 --- a/frontend/src/components/tree-section/index.js +++ b/frontend/src/components/tree-section/index.js @@ -62,7 +62,7 @@ const TreeSection = ({ title, children, moreKey, moreOperations, moreOperationCl )}
- +
diff --git a/frontend/src/components/tree-view/tree-node-view.js b/frontend/src/components/tree-view/tree-node-view.js index c383e81bc4..7836e52747 100644 --- a/frontend/src/components/tree-view/tree-node-view.js +++ b/frontend/src/components/tree-view/tree-node-view.js @@ -304,9 +304,9 @@ class TreeNodeView extends React.Component { style={{paddingLeft: leftIndent}} >{node.object.name}
- {type === 'dir' && (!node.isLoaded || (node.isLoaded && node.hasChildren())) && ( + {type === 'dir' && (!node.isLoaded || (node.isLoaded && node.hasChildren())) && ( e.stopPropagation()} onClick={this.onLoadToggle} > diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css index e0109627f7..5308c1b057 100644 --- a/frontend/src/css/layout.css +++ b/frontend/src/css/layout.css @@ -348,9 +348,8 @@ img[src=""],img:not([src]) { /* for first loading img*/ color: #444; } -.path-container .add-wiki-dropdown .sf3-font-drop-down { +.path-container .add-wiki-dropdown .sf3-font-down { color: #999; cursor: pointer; font-size: 12px; - transform: scale(.8); } diff --git a/frontend/src/css/lib-content-view.css b/frontend/src/css/lib-content-view.css index c0a3017cd1..7dd20c9f54 100644 --- a/frontend/src/css/lib-content-view.css +++ b/frontend/src/css/lib-content-view.css @@ -104,23 +104,24 @@ .folder-toggle-icon { position: absolute; left: 0; - color: #c0c0c0; + color: #666666; line-height: 1.625; width: 1.5rem; display: flex; align-content: center; justify-content: center; + font-size: 13px; } .tree-node-drop { - background-color:rgb(255,239,178); + background-color: rgb(255, 239, 178); } .tree-node-icon { display: inline-block; width: 1rem; text-align: center; - color: #b0b0b0; + color: #666666; } .tree-node-inner .right-icon { @@ -129,7 +130,7 @@ right: 0.5rem; bottom: 0; width: 1rem; - color: #888; + color: #666666; z-index: 2; font-size: 0.8125rem; text-align: center; @@ -141,6 +142,7 @@ vertical-align: middle; font-size: 0.8125rem; line-height: 1.625rem !important; + color: #666666; } .tree-node-hight-light { diff --git a/frontend/src/css/side-panel.css b/frontend/src/css/side-panel.css index f5524360d2..087b1f52a1 100644 --- a/frontend/src/css/side-panel.css +++ b/frontend/src/css/side-panel.css @@ -105,7 +105,7 @@ } .tree-node-inner-hover { - background-color: rgb(255,239,178); + background-color: rgb(255, 239, 178); border-radius: 0.25rem; } @@ -132,19 +132,20 @@ .folder-toggle-icon { position: absolute; left: 0; - color: #c0c0c0; + color: #666666; line-height: 1.625; width: 1.5rem; display: flex; align-content: center; justify-content: center; + font-size: 13px; } .tree-node-icon { display: inline-block; width: 1rem; text-align: center; - color: #b0b0b0; + color: #666666; } .tree-node-inner .right-icon { @@ -165,6 +166,7 @@ vertical-align: middle; font-size: 0.8125rem; line-height: 1.625rem !important; + color: #666666; } .tree-node-hight-light { diff --git a/frontend/src/pages/dashboard/user-selector.js b/frontend/src/pages/dashboard/user-selector.js index 38745e4a70..32f8bfd2ac 100644 --- a/frontend/src/pages/dashboard/user-selector.js +++ b/frontend/src/pages/dashboard/user-selector.js @@ -79,7 +79,7 @@ class UserSelector extends Component { {currentSelectedUsers.map(item => item.name).join(', ')} ) : gettext('Modified by')} - + {isPopoverOpen && (
this.userSelector = ref}> diff --git a/frontend/src/pages/my-libs/mylib-repo-list-view.js b/frontend/src/pages/my-libs/mylib-repo-list-view.js index 48dee45c13..fdf9a480c9 100644 --- a/frontend/src/pages/my-libs/mylib-repo-list-view.js +++ b/frontend/src/pages/my-libs/mylib-repo-list-view.js @@ -82,7 +82,7 @@ class MylibRepoListView extends React.Component { renderPCUI = () => { const { inAllLibs, currentViewMode = 'list' } = this.props; const showStorageBackend = !inAllLibs && storages.length > 0; - const sortIcon = this.props.sortOrder === 'asc' ? : ; + const sortIcon = this.props.sortOrder === 'asc' ? : ; return currentViewMode == 'list' ? ( diff --git a/frontend/src/pages/my-libs/mylib-repo-menu.js b/frontend/src/pages/my-libs/mylib-repo-menu.js index 2fc68458bc..84bdc514ad 100644 --- a/frontend/src/pages/my-libs/mylib-repo-menu.js +++ b/frontend/src/pages/my-libs/mylib-repo-menu.js @@ -227,11 +227,11 @@ class MylibRepoMenu extends React.Component { onMouseMove={(e) => {e.stopPropagation();}} > {this.translateOperations(item)} + {advancedOperations.map((item, index)=> { diff --git a/frontend/src/pages/org-admin/libraries/org-all-repos.js b/frontend/src/pages/org-admin/libraries/org-all-repos.js index 3298d2176d..1011eef0d0 100644 --- a/frontend/src/pages/org-admin/libraries/org-all-repos.js +++ b/frontend/src/pages/org-admin/libraries/org-all-repos.js @@ -65,7 +65,7 @@ class Content extends Component { ); const initialSortIcon = ; - const sortIcon = ; + const sortIcon = ; const table = (
diff --git a/frontend/src/pages/org-admin/org-users-list.js b/frontend/src/pages/org-admin/org-users-list.js index f42bf49156..5b99c0238b 100644 --- a/frontend/src/pages/org-admin/org-users-list.js +++ b/frontend/src/pages/org-admin/org-users-list.js @@ -61,7 +61,7 @@ class OrgUsersList extends React.Component { // initial sort icon sortIcon = ; } else { - sortIcon = ; + sortIcon = ; } let { orgUsers, page, pageNext } = this.props; return ( diff --git a/frontend/src/pages/org-admin/statistic/traffic-table.js b/frontend/src/pages/org-admin/statistic/traffic-table.js index 34bcb944a1..921c99cc0f 100644 --- a/frontend/src/pages/org-admin/statistic/traffic-table.js +++ b/frontend/src/pages/org-admin/statistic/traffic-table.js @@ -18,7 +18,7 @@ class TrafficTable extends React.Component { render() { const { type, sortBy, sortOrder } = this.props; - const sortIcon = sortOrder == 'asc' ? : ; + const sortIcon = sortOrder == 'asc' ? : ; return (
diff --git a/frontend/src/pages/share-admin/folders.js b/frontend/src/pages/share-admin/folders.js index 5448408f1d..ba6517b722 100644 --- a/frontend/src/pages/share-admin/folders.js +++ b/frontend/src/pages/share-admin/folders.js @@ -38,7 +38,7 @@ class Content extends Component { // sort const sortByName = sortBy == 'name'; - const sortIcon = sortOrder == 'asc' ? : ; + const sortIcon = sortOrder == 'asc' ? : ; const isDesktop = Utils.isDesktop(); const table = ( diff --git a/frontend/src/pages/share-admin/libraries.js b/frontend/src/pages/share-admin/libraries.js index 57b395fae0..1e19b6116f 100644 --- a/frontend/src/pages/share-admin/libraries.js +++ b/frontend/src/pages/share-admin/libraries.js @@ -37,7 +37,7 @@ class Content extends Component { // sort const sortByName = sortBy == 'name'; - const sortIcon = sortOrder == 'asc' ? : ; + const sortIcon = sortOrder == 'asc' ? : ; const isDesktop = Utils.isDesktop(); const table = ( diff --git a/frontend/src/pages/share-admin/share-links.js b/frontend/src/pages/share-admin/share-links.js index 86f8fd722f..ec80a39de2 100644 --- a/frontend/src/pages/share-admin/share-links.js +++ b/frontend/src/pages/share-admin/share-links.js @@ -73,7 +73,7 @@ class Content extends Component { // sort const sortByName = sortBy == 'name'; const sortByTime = sortBy == 'time'; - const sortIcon = sortOrder == 'asc' ? : ; + const sortIcon = sortOrder == 'asc' ? : ; const isDesktop = Utils.isDesktop(); // only for some columns diff --git a/frontend/src/pages/shared-libs/shared-libs.js b/frontend/src/pages/shared-libs/shared-libs.js index 9775cfab3e..d82f30fbf5 100644 --- a/frontend/src/pages/shared-libs/shared-libs.js +++ b/frontend/src/pages/shared-libs/shared-libs.js @@ -72,7 +72,7 @@ class Content extends Component { const sortByName = sortBy == 'name'; const sortByTime = sortBy == 'time'; const sortBySize = sortBy == 'size'; - const sortIcon = sortOrder == 'asc' ? : ; + const sortIcon = sortOrder == 'asc' ? : ; const desktopThead = ( diff --git a/frontend/src/pages/sys-admin/dingtalk/dingtalk-departments-tree-node.js b/frontend/src/pages/sys-admin/dingtalk/dingtalk-departments-tree-node.js index 0436116df9..7b46cd3459 100644 --- a/frontend/src/pages/sys-admin/dingtalk/dingtalk-departments-tree-node.js +++ b/frontend/src/pages/sys-admin/dingtalk/dingtalk-departments-tree-node.js @@ -86,8 +86,8 @@ class DingtalkDepartmentsTreeNode extends Component { render() { const { isChildrenShow, department, checkedDepartmentId } = this.props; let toggleClass = classNames({ - 'folder-toggle-icon fa fa-caret-down': department.children && this.state.isChildrenShow, - 'folder-toggle-icon fa fa-caret-right': department.children && !this.state.isChildrenShow, + 'folder-toggle-icon sf3-font sf3-font-down rotate-270': department.children && this.state.isChildrenShow, + 'folder-toggle-icon sf3-font sf3-font-down': department.children && !this.state.isChildrenShow, }); let nodeInnerClass = classNames({ 'tree-node-inner': true, diff --git a/frontend/src/pages/sys-admin/links/share-links.js b/frontend/src/pages/sys-admin/links/share-links.js index a8639d9b12..086a82068b 100644 --- a/frontend/src/pages/sys-admin/links/share-links.js +++ b/frontend/src/pages/sys-admin/links/share-links.js @@ -55,7 +55,7 @@ class Content extends Component { ); const initialSortIcon = ; - const sortIcon = ; + const sortIcon = ; const table = (
diff --git a/frontend/src/pages/sys-admin/repos/repos.js b/frontend/src/pages/sys-admin/repos/repos.js index 30427be2e7..93d76c553a 100644 --- a/frontend/src/pages/sys-admin/repos/repos.js +++ b/frontend/src/pages/sys-admin/repos/repos.js @@ -67,7 +67,7 @@ class Content extends Component { ); const initialSortIcon = ; - const sortIcon = ; + const sortIcon = ; const table = (
diff --git a/frontend/src/pages/sys-admin/statistic/traffic-table.js b/frontend/src/pages/sys-admin/statistic/traffic-table.js index 34bcb944a1..921c99cc0f 100644 --- a/frontend/src/pages/sys-admin/statistic/traffic-table.js +++ b/frontend/src/pages/sys-admin/statistic/traffic-table.js @@ -18,7 +18,7 @@ class TrafficTable extends React.Component { render() { const { type, sortBy, sortOrder } = this.props; - const sortIcon = sortOrder == 'asc' ? : ; + const sortIcon = sortOrder == 'asc' ? : ; return (
diff --git a/frontend/src/pages/sys-admin/users/users-content.js b/frontend/src/pages/sys-admin/users/users-content.js index d9bf8750b3..a07a223d32 100644 --- a/frontend/src/pages/sys-admin/users/users-content.js +++ b/frontend/src/pages/sys-admin/users/users-content.js @@ -78,7 +78,7 @@ class Content extends Component { // initial sort icon sortIcon = ; } else { - sortIcon = ; + sortIcon = ; } const spaceText = gettext('Space Used'); const spaceEl = diff --git a/frontend/src/pages/sys-admin/users/users-filter-bar.css b/frontend/src/pages/sys-admin/users/users-filter-bar.css index 9f25885bd7..55a1136bfe 100644 --- a/frontend/src/pages/sys-admin/users/users-filter-bar.css +++ b/frontend/src/pages/sys-admin/users/users-filter-bar.css @@ -6,7 +6,7 @@ border-radius: 5px; } -.users-filter-bar .users-filter-bar-dropdown-toggle .sf3-font-drop-down { +.users-filter-bar .users-filter-bar-dropdown-toggle .sf3-font-down { color: #999; margin-left: auto; display: inline-flex; @@ -15,7 +15,6 @@ font-size: 12px; width: 24px; height: 24px; - transform: scale(.8); } .users-filter-bar .users-filter-bar-dropdown-toggle:hover { diff --git a/frontend/src/pages/sys-admin/users/users-filter-bar.js b/frontend/src/pages/sys-admin/users/users-filter-bar.js index a616423a50..5787864f7c 100644 --- a/frontend/src/pages/sys-admin/users/users-filter-bar.js +++ b/frontend/src/pages/sys-admin/users/users-filter-bar.js @@ -62,7 +62,7 @@ class UsersFilterBar extends Component { className="users-filter-bar-dropdown-toggle" > {gettext('Status')}{': '}{this.translateStatus(this.props.isActive)} - + { onStatusChange(''); }}> @@ -84,7 +84,7 @@ class UsersFilterBar extends Component { className="users-filter-bar-dropdown-toggle" > {gettext('Role')}{': '}{this.translateRole(this.props.role)} - + { onRoleChange(''); }}> diff --git a/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js b/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js index d7b39c137e..c6d4cc14ee 100644 --- a/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js +++ b/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js @@ -86,8 +86,8 @@ class WorkWeixinDepartmentsTreeNode extends Component { render() { const { isChildrenShow, department, checkedDepartmentId } = this.props; let toggleClass = classNames({ - 'folder-toggle-icon fa fa-caret-down': department.children && this.state.isChildrenShow, - 'folder-toggle-icon fa fa-caret-right': department.children && !this.state.isChildrenShow, + 'folder-toggle-icon sf3-font sf3-font-down rotate-270': department.children && this.state.isChildrenShow, + 'folder-toggle-icon sf3-font sf3-font-down': department.children && !this.state.isChildrenShow, }); let nodeInnerClass = classNames({ 'tree-node-inner': true, diff --git a/frontend/src/pages/wiki/index-md-viewer/nav-item.js b/frontend/src/pages/wiki/index-md-viewer/nav-item.js index 3bfdd0064e..52c0478a57 100644 --- a/frontend/src/pages/wiki/index-md-viewer/nav-item.js +++ b/frontend/src/pages/wiki/index-md-viewer/nav-item.js @@ -70,7 +70,7 @@ class NavItem extends React.Component { return (
- {} + {this.renderLink(node)} {expanded && node.children.map((child, index) => { diff --git a/frontend/src/pages/wiki/wiki.css b/frontend/src/pages/wiki/wiki.css index 3acb9f37ac..7fe4ca0eb1 100644 --- a/frontend/src/pages/wiki/wiki.css +++ b/frontend/src/pages/wiki/wiki.css @@ -41,9 +41,9 @@ } .wiki-pages-container .tree-view { - margin-left: -10px; + margin-left: 10px; margin-top: 14px; - padding-left:0; + padding-left: 0px; } img[src=""] { diff --git a/frontend/src/pages/wiki2/css/view-structure.css b/frontend/src/pages/wiki2/css/view-structure.css index 32c0683105..366abb7bfc 100644 --- a/frontend/src/pages/wiki2/css/view-structure.css +++ b/frontend/src/pages/wiki2/css/view-structure.css @@ -281,14 +281,7 @@ align-items: center; } -.view-structure .more-view-operation .folders-dropdown .dtable-icon-right-slide { - display: inline-flex; - font-size: 12px; - transform: scale(0.8); -} - -.view-structure .more-view-operation .btn-move-to-folder:focus .dtable-icon-insert-right, -.view-structure .more-view-operation .btn-move-to-folder:focus .dtable-icon-right-slide { +.view-structure .more-view-operation .btn-move-to-folder:focus .dtable-icon-insert-right { color: #fff; } @@ -350,12 +343,6 @@ color: #8c8c8c; } -.dtable-dropdown-menu .dropdown-item .seafile-multicolor-icon.seafile-multicolor-icon-right-slide { - font-size: 12px; - transform: scale(0.8); - color: #666; -} - .dtable-dropdown-menu .dropdown-item:hover .item-icon, .dtable-dropdown-menu .dropdown-item:hover .seafile-multicolor-icon { color: #fff; diff --git a/frontend/src/pages/wiki2/view-structure/folders/folder-item.js b/frontend/src/pages/wiki2/view-structure/folders/folder-item.js index 9c8a6c674d..6ba24baef1 100644 --- a/frontend/src/pages/wiki2/view-structure/folders/folder-item.js +++ b/frontend/src/pages/wiki2/view-structure/folders/folder-item.js @@ -202,7 +202,9 @@ class FolderItem extends Component { id={viewEditorId} > {this.state.isMouseEnter ? - +
+ +
: } diff --git a/frontend/src/pages/wiki2/view-structure/views/page-dropdownmenu.js b/frontend/src/pages/wiki2/view-structure/views/page-dropdownmenu.js index e3ceebdf37..f474217d0d 100644 --- a/frontend/src/pages/wiki2/view-structure/views/page-dropdownmenu.js +++ b/frontend/src/pages/wiki2/view-structure/views/page-dropdownmenu.js @@ -190,7 +190,7 @@ export default class PageDropdownMenu extends Component { {gettext('Move to')} - +
diff --git a/frontend/src/pages/wiki2/view-structure/views/view-item.js b/frontend/src/pages/wiki2/view-structure/views/view-item.js index b0bf4b1e09..bc86412af0 100644 --- a/frontend/src/pages/wiki2/view-structure/views/view-item.js +++ b/frontend/src/pages/wiki2/view-structure/views/view-item.js @@ -231,11 +231,9 @@ class ViewItem extends Component { } {(this.state.isMouseEnter && childNumber > 0) && - +
+ +
} {/* {this.renderIcon(view.icon)} */} {view.name} diff --git a/frontend/src/pages/wikis/wikis.js b/frontend/src/pages/wikis/wikis.js index 725d9004d8..1bf56f4b0a 100644 --- a/frontend/src/pages/wikis/wikis.js +++ b/frontend/src/pages/wikis/wikis.js @@ -206,7 +206,7 @@ class Wikis extends Component { onMouseMove={(e) => {e.stopPropagation();}} > - + {this.toggelAddWikiDialog();}}>{gettext('Add Wiki')} diff --git a/frontend/src/shared-dir-view.js b/frontend/src/shared-dir-view.js index e8d61111f2..34c899fb18 100644 --- a/frontend/src/shared-dir-view.js +++ b/frontend/src/shared-dir-view.js @@ -648,7 +648,7 @@ class Content extends React.Component { ); } - const sortIcon = ; + const sortIcon = ; return mode == 'list' ? (
diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css index 37f7c0476d..1ed8c74644 100644 --- a/media/css/seahub_react.css +++ b/media/css/seahub_react.css @@ -266,10 +266,10 @@ a, a:hover { color: #ec8000; } /* for 'extra small' */ @media (max-width: 575px) { .w-xs-200 { - width: 200%; + width: 200%; } .w-xs-250 { - width: 250%; + width: 250%; } } @@ -738,23 +738,17 @@ a, a:hover { color: #ec8000; } } .side-nav-con .toggle-icon { - color: #999; + color: #666666; margin-left: auto; } -.side-nav-con .toggle-icon.sf3-font-drop-down { +.side-nav-con .toggle-icon.sf3-font-down { display: flex; justify-content: center; align-items: center; cursor: pointer; - font-size: 12px; width: 24px; height: 24px; - transform: scale(.8); -} - -.side-nav-con .toggle-icon.sf3-font-drop-down.icon-rotate-90 { - transform: rotate(90deg) scale(.8); } #draft-num { @@ -956,6 +950,10 @@ table th { color: #9c9c9c; } +table th .sf3-font { + font-size: 0.8125rem; +} + table td { padding: 0.5rem 0.1875rem; border-bottom: 1px solid #e8e8e8; @@ -975,6 +973,10 @@ table td { font-size: 0; } +.table-thead-hidden thead .sf3-font { + display: none !important; +} + .tr-highlight { background-color: #f8f8f8; } @@ -1036,11 +1038,15 @@ a.table-sort-op { @media (max-width:767px) { a.table-sort-op { - display: inline-block; - margin-left: 15px; + display: inline-block; + margin-left: 15px; } } +a.table-sort-op.sf3-font { + font-size: 13px; +} + a.table-sort-op:hover { outline: none; text-decoration: none; @@ -1097,7 +1103,7 @@ a.table-sort-op:hover { @media (min-width: 768px) { .empty-tip { - padding: 30px 80px; + padding: 30px 80px; } } @@ -1482,3 +1488,15 @@ a.table-sort-op:hover { background-color: #f8f8f8; } } + +.rotate-90 { + transform: rotate(90deg); +} + +.rotate-180 { + transform: rotate(180deg); +} + +.rotate-270 { + transform: rotate(270deg); +}