diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js index b6994c708b..380ff54f1f 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-item.js +++ b/frontend/src/components/dirent-list-view/dirent-list-item.js @@ -637,7 +637,7 @@ class DirentListItem extends React.Component { )} {showShareBtn && ( - + )} {(dirent.permission === 'rw' || dirent.permission === 'cloud-edit' || (isCustomPermission && canDelete)) && ( @@ -660,7 +660,7 @@ class DirentListItem extends React.Component { )} {showShareBtn && ( - + )} {(dirent.permission === 'rw' || dirent.permission === 'cloud-edit' || (isCustomPermission && canDelete)) && ( diff --git a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js index 68068956f0..5f953fc22b 100644 --- a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js +++ b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js @@ -497,9 +497,9 @@ class SharedRepoListItem extends React.Component { } else { operations = this.generatorOperations(); } - const shareOperation = ; + const shareOperation = ; const unshareOperation = ; - const deleteOperation = ; + const deleteOperation = ; if (this.isDeparementOnwerGroupMember) { const advancedOperations = this.getAdvancedOperations(); diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css index a2100577f0..65a0075d49 100644 --- a/frontend/src/css/layout.css +++ b/frontend/src/css/layout.css @@ -287,18 +287,26 @@ img[src=""],img:not([src]){ /* for first loading img*/ word-break: keep-all; max-width: 80%; } + .path-container a, .path-container span { max-height: 50px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; -} +} + .path-container span, .path-container a { flex-shrink: 1; -} +} + .path-container span:first-child, .path-container span:last-child { flex-shrink: 0; -} +} + .path-container span.path-file-name, .path-container span.path-repo-name { flex-shrink: 1; } + +.path-container .op-btn .sf3-font { + color: #444; +} diff --git a/frontend/src/css/toolbar.css b/frontend/src/css/toolbar.css index 43998fb991..1137760b77 100644 --- a/frontend/src/css/toolbar.css +++ b/frontend/src/css/toolbar.css @@ -75,6 +75,7 @@ line-height: 2; border: 0; border-radius: 2px; + font-weight: normal; } .sf-view-mode-btn:hover { diff --git a/frontend/src/pages/my-libs/mylib-repo-list-item.js b/frontend/src/pages/my-libs/mylib-repo-list-item.js index 6f00ac079d..fd1d8b1cab 100644 --- a/frontend/src/pages/my-libs/mylib-repo-list-item.js +++ b/frontend/src/pages/my-libs/mylib-repo-list-item.js @@ -351,7 +351,7 @@ class MylibRepoListItem extends React.Component { {(repo.repo_name && this.state.isOpIconShow) && (
- +
- + {gettext('Download')}
{(path[0] !== 0 && path[1] !== 0 && path[2] !== 0) && (
- + {gettext('Copy')}
)} diff --git a/frontend/src/pages/shared-libs/shared-libs.js b/frontend/src/pages/shared-libs/shared-libs.js index fdb1d01ecd..30a5168552 100644 --- a/frontend/src/pages/shared-libs/shared-libs.js +++ b/frontend/src/pages/shared-libs/shared-libs.js @@ -263,7 +263,7 @@ class Item extends Component { data.icon_title = Utils.getLibIconTitle(data); let iconVisibility = this.state.showOpIcon ? '' : ' invisible'; - let shareIconClassName = 'op-icon sf2-icon-share repo-share-btn' + iconVisibility; + let shareIconClassName = 'op-icon sf3-font-share sf3-font repo-share-btn' + iconVisibility; let leaveShareIconClassName = 'op-icon sf2-icon-x3' + iconVisibility; let shareRepoUrl = this.repoURL = `${siteRoot}library/${data.repo_id}/${Utils.encodePath(data.repo_name)}/`; diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css index c9568da637..66413d57f3 100644 --- a/media/css/seahub_react.css +++ b/media/css/seahub_react.css @@ -192,7 +192,7 @@ a, a:hover { color: #ec8000; } margin-left: 0.5rem; vertical-align: middle; font-style: normal; - font-size: 0.85rem; + font-size: 1rem; line-height: 1; cursor: pointer; color: #999; @@ -360,6 +360,7 @@ a, a:hover { color: #ec8000; } } .op-icon { + font-size: 1rem; color: #999; } diff --git a/media/css/sf_font3/iconfont.css b/media/css/sf_font3/iconfont.css index a04074015d..0fdb372694 100644 --- a/media/css/sf_font3/iconfont.css +++ b/media/css/sf_font3/iconfont.css @@ -1,11 +1,11 @@ @font-face { font-family: "sf3-font"; /* Project id 1230969 */ - src: url('iconfont.eot?t=1715743130302'); /* IE9 */ - src: url('iconfont.eot?t=1715743130302#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('iconfont.woff2?t=1715743130302') format('woff2'), - url('iconfont.woff?t=1715743130302') format('woff'), - url('iconfont.ttf?t=1715743130302') format('truetype'), - url('iconfont.svg?t=1715743130302#sf3-font') format('svg'); + src: url('iconfont.eot?t=1716614768424'); /* IE9 */ + src: url('iconfont.eot?t=1716614768424#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('iconfont.woff2?t=1716614768424') format('woff2'), + url('iconfont.woff?t=1716614768424') format('woff'), + url('iconfont.ttf?t=1716614768424') format('truetype'), + url('iconfont.svg?t=1716614768424#sf3-font') format('svg'); } .sf3-font { @@ -16,6 +16,10 @@ -moz-osx-font-smoothing: grayscale; } +.sf3-font-share:before { + content: "\e820"; +} + .sf3-font-rename:before { content: "\e65c"; } @@ -180,18 +184,10 @@ content: "\e7fa"; } -.sf3-font-download:before { - content: "\e7fb"; -} - .sf3-font-entry:before { content: "\e7fc"; } -.sf3-font-delete:before { - content: "\e7fd"; -} - .sf3-font-files1:before { content: "\e7fe"; } @@ -204,14 +200,6 @@ content: "\e7f3"; } -.sf3-font-copy:before { - content: "\e7f4"; -} - -.sf3-font-more-level1:before { - content: "\e7f5"; -} - .sf3-font-sort1:before { content: "\e7f6"; } @@ -248,10 +236,6 @@ content: "\e7d8"; } -.sf3-font-more-level:before { - content: "\e7d7"; -} - .sf3-font-desktop:before { content: "\e720"; } diff --git a/media/css/sf_font3/iconfont.eot b/media/css/sf_font3/iconfont.eot index 6e467cdf0c..a366a0a897 100644 Binary files a/media/css/sf_font3/iconfont.eot and b/media/css/sf_font3/iconfont.eot differ diff --git a/media/css/sf_font3/iconfont.svg b/media/css/sf_font3/iconfont.svg index b18251d165..621e79afcb 100644 --- a/media/css/sf_font3/iconfont.svg +++ b/media/css/sf_font3/iconfont.svg @@ -14,6 +14,8 @@ /> + + @@ -26,7 +28,7 @@ - + @@ -34,11 +36,11 @@ - + - + @@ -96,22 +98,14 @@ - - - - - - - - @@ -130,8 +124,6 @@ - - diff --git a/media/css/sf_font3/iconfont.ttf b/media/css/sf_font3/iconfont.ttf index c7122fb1bc..cf27bfc96f 100644 Binary files a/media/css/sf_font3/iconfont.ttf and b/media/css/sf_font3/iconfont.ttf differ diff --git a/media/css/sf_font3/iconfont.woff b/media/css/sf_font3/iconfont.woff index bcc29161a8..a02d378ade 100644 Binary files a/media/css/sf_font3/iconfont.woff and b/media/css/sf_font3/iconfont.woff differ diff --git a/media/css/sf_font3/iconfont.woff2 b/media/css/sf_font3/iconfont.woff2 index b4f546beb5..f64abf9161 100644 Binary files a/media/css/sf_font3/iconfont.woff2 and b/media/css/sf_font3/iconfont.woff2 differ