Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

12.0 fix icon style #6115

Merged
merged 3 commits into from
May 25, 2024
Merged

12.0 fix icon style #6115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59e2f8c
01 update font
Michael18811380328 May 25, 2024
0589132
02 change icon color
Michael18811380328 May 25, 2024
1f5b3ec
03 change icon
Michael18811380328 May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/dirent-list-view/dirent-list-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ class DirentListItem extends React.Component {
<a href="#" className="op-icon sf2-icon-download" title={gettext('Download')} role="button" aria-label={gettext('Download')} onClick={this.onItemDownload}></a>
)}
{showShareBtn && (
<a href="#" className="op-icon sf2-icon-share" title={gettext('Share')} role="button" aria-label={gettext('Share')} onClick={this.onItemShare}></a>
<a href="#" className="op-icon sf3-font-share sf3-font" title={gettext('Share')} role="button" aria-label={gettext('Share')} onClick={this.onItemShare}></a>
)}
{(dirent.permission === 'rw' || dirent.permission === 'cloud-edit' || (isCustomPermission && canDelete)) && (
<a href="#" className="op-icon sf3-font-delete1 sf3-font" title={gettext('Delete')} role="button" aria-label={gettext('Delete')} onClick={this.onItemDelete}></a>
Expand All @@ -660,7 +660,7 @@ class DirentListItem extends React.Component {
<a href="#" className="op-icon sf2-icon-download" title={gettext('Download')} role="button" aria-label={gettext('Download')} onClick={this.onItemDownload}></a>
)}
{showShareBtn && (
<a href="#" className="op-icon sf2-icon-share" title={gettext('Share')} role="button" aria-label={gettext('Share')} onClick={this.onItemShare}></a>
<a href="#" className="op-icon sf3-font-share sf3-font" title={gettext('Share')} role="button" aria-label={gettext('Share')} onClick={this.onItemShare}></a>
)}
{(dirent.permission === 'rw' || dirent.permission === 'cloud-edit' || (isCustomPermission && canDelete)) && (
<a href="#" className="op-icon sf3-font-delete1 sf3-font" title={gettext('Delete')} role="button" aria-label={gettext('Delete')} onClick={this.onItemDelete}></a>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,9 @@ class SharedRepoListItem extends React.Component {
} else {
operations = this.generatorOperations();
}
const shareOperation = <a href="#" className="op-icon sf2-icon-share" title={gettext('Share')} role="button" aria-label={gettext('Share')} onClick={this.onItemShare}></a>;
const shareOperation = <a href="#" className="op-icon sf3-font-share sf3-font" title={gettext('Share')} role="button" aria-label={gettext('Share')} onClick={this.onItemShare}></a>;
const unshareOperation = <a href="#" className="op-icon sf2-icon-x3" title={gettext('Unshare')} role="button" aria-label={gettext('Unshare')} onClick={this.onItemUnshare}></a>;
const deleteOperation = <a href="#" className="op-icon sf3-font-delete1 sf3-font" title={gettext('Delete')} role="button" aria-label={gettext('Delete')} onClick={this.onItemDeleteToggle}></a>;
const deleteOperation = <a href="#" className="op-icon sf3-font-delete1 sf3-font" title={gettext('Delete')} role="button" aria-label={gettext('Delete')} onClick={this.onItemDeleteToggle}></a>;

if (this.isDeparementOnwerGroupMember) {
const advancedOperations = this.getAdvancedOperations();
Expand Down
14 changes: 11 additions & 3 deletions frontend/src/css/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
1 change: 1 addition & 0 deletions frontend/src/css/toolbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
line-height: 2;
border: 0;
border-radius: 2px;
font-weight: normal;
}

.sf-view-mode-btn:hover {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/my-libs/mylib-repo-list-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ class MylibRepoListItem extends React.Component {
<td>
{(repo.repo_name && this.state.isOpIconShow) && (
<div>
<a href="#" className="op-icon sf2-icon-share" title={gettext('Share')} role="button" aria-label={gettext('Share')} onClick={this.onShareToggle}></a>
<a href="#" className="op-icon sf3-font-share sf3-font" title={gettext('Share')} role="button" aria-label={gettext('Share')} onClick={this.onShareToggle}></a>
<a href="#" className="op-icon sf3-font-delete1 sf3-font" title={gettext('Delete')} role="button" aria-label={gettext('Delete')} onClick={this.onDeleteToggle}></a>
<MylibRepoMenu
isPC={true}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/sdoc/sdoc-file-history/history-version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ class HistoryVersion extends React.Component {
>
<ModalBody className='sdoc-operation-mobile-modal-body'>
<div className='option-item'>
<i className='mr-3 sf3-font sf3-font-download'></i>
<i className='mr-3 sf3-font sf3-font-download1'></i>
<a href={url} onClick={this.onItemDownLoad}>{gettext('Download')}</a>
</div>
{(path[0] !== 0 && path[1] !== 0 && path[2] !== 0) && (
<div className='option-item'>
<i className='mr-3 sf3-font sf3-font-copy'></i>
<i className='mr-3 sf3-font sf3-font-copy1'></i>
<span href={url} onClick={this.onItemCopy}>{gettext('Copy')}</span>
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/shared-libs/shared-libs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}/`;

Expand Down
3 changes: 2 additions & 1 deletion media/css/seahub_react.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -360,6 +360,7 @@ a, a:hover { color: #ec8000; }
}

.op-icon {
font-size: 1rem;
color: #999;
}

Expand Down
36 changes: 10 additions & 26 deletions media/css/sf_font3/iconfont.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -16,6 +16,10 @@
-moz-osx-font-smoothing: grayscale;
}

.sf3-font-share:before {
content: "\e820";
}

.sf3-font-rename:before {
content: "\e65c";
}
Expand Down Expand Up @@ -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";
}
Expand All @@ -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";
}
Expand Down Expand Up @@ -248,10 +236,6 @@
content: "\e7d8";
}

.sf3-font-more-level:before {
content: "\e7d7";
}

.sf3-font-desktop:before {
content: "\e720";
}
Expand Down
Binary file modified media/css/sf_font3/iconfont.eot
View file
Open in desktop
Binary file not shown.
Loading
Loading