Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[#66708] Change old spot-icons to octicons

Yauheni Suhakoue0b3576f6e0a
diff --git a/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts b/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
index 860017aa10d..0a6263ab84d 100644
--- a/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
+++ b/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.component.ts
@@ -241,7 +241,7 @@ export class FileLinkListItemComponent implements OnInit, OnChanges, AfterViewIn
private downloadAction():FloatingAction {
return new FloatingAction(
- 'download-arrow',
+ 'download',
this.text.title.downloadFileLink,
undefined,
{ url: this.fileLink._links.staticOriginDownload.href, target: '_self' },
diff --git a/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.html b/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.html
index c21d2b68d83..91f420a18fa 100644
--- a/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.html
+++ b/frontend/src/app/shared/components/storages/file-link-list-item/file-link-list-item.html
@@ -25,9 +25,11 @@
<div
class="spot-list--item-title op-file-list--item-title"
>
- <span
- class="spot-icon spot-icon_{{fileLinkIcon.icon}} op-files-tab--icon op-files-tab--icon_{{fileLinkIcon.clazz}}"
- ></span>
+ <ng-container [ngSwitch]="fileLinkIcon.icon">
+ <svg *ngSwitchCase="'file'" file-icon size="small" class="op-files-tab--icon"></svg>
+ <svg *ngSwitchCase="'file-media'" file-media-icon size="small" class="op-files-tab--icon"></svg>
+ <svg *ngSwitchDefault file-icon size="small" class="op-files-tab--icon"></svg>
+ </ng-container>
<span class="ellipsis" [textContent]="fileLink.originData.name"></span>
</div>
@@ -47,19 +49,27 @@
>
<ng-container *ngFor="let action of floatingActions">
<a *ngIf="!!action.href"
- class="spot-link"
+ class="spot-link octicon-link"
[title]="action.title"
[href]="action.href.url"
[target]="action.href.target"
>
- <span class="spot-icon spot-icon_{{action.iconClass}}"></span>
+ <ng-container [ngSwitch]="action.iconClass">
+ <svg *ngSwitchCase="'remove-link'" unlink-icon size="small" class="octicon" vertical-align="middle"></svg>
+ <svg *ngSwitchCase="'download'" download-icon class="octicon" size="small" vertical-align="middle"></svg>
+ <svg *ngSwitchCase="'folder-open'" file-directory-open-fill-icon class="octicon" size="small" vertical-align="middle"></svg>
+ </ng-container>
</a>
<button *ngIf="!!action.action"
- class="spot-link"
+ class="spot-link octicon-link"
[title]="action.title"
(click)="action.action()"
>
- <span class="spot-icon spot-icon_{{action.iconClass}}"></span>
+ <ng-container [ngSwitch]="action.iconClass">
+ <svg *ngSwitchCase="'remove-link'" unlink-icon size="small" class="octicon" vertical-align="middle"></svg>
+ <svg *ngSwitchCase="'download'" download-icon class="octicon" size="small" vertical-align="middle"></svg>
+ <svg *ngSwitchCase="'folder-open'" file-directory-open-fill-icon class="octicon" size="small" vertical-align="middle"></svg>
+ </ng-container>
</button>
</ng-container>
</div>
diff --git a/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.html b/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.html
index 81902cc108b..b000450c93f 100644
--- a/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.html
+++ b/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.html
@@ -19,7 +19,7 @@
class="spot-link op-toast--close"
(click)="closeAlert()"
>
- <span class="spot-icon spot-icon_close"></span>
+ <svg x-icon size="small"></svg>
</button>
</div>
</div>
@@ -52,14 +52,18 @@
<ng-template #emptyTemplate>
<div class="spot-body-small spot-body-small_bold op-file-picker--info">
- <span class="spot-icon spot-icon_folder-open op-file-picker--info-icon"></span>
+ <svg
+ class="op-file-picker--info-icon"
+ file-directory-fill-icon
+ size="small"
+ ></svg>
<span [textContent]="text.content.empty"></span>
</div>
</ng-template>
<ng-template #notFoundTemplate>
<div class="spot-body-small spot-body-small_bold op-file-picker--info">
- <span class="spot-icon spot-icon_remove-link op-file-picker--info-icon"></span>
+ <svg x-circle-icon size="small" class="op-file-picker--info-icon"></svg>
<span [textContent]="text.content.noConnection(storageType)"></span>
<span class="spot-body-small op-file-picker--info-sub-text"
[textContent]="text.content.noConnectionHint(storageType)"></span>
@@ -78,7 +82,7 @@
data-test-selector="op-files-picker-modal--select-all"
(click)="selectAllOfCurrentLevel()"
>
- <span class="spot-icon spot-icon_select-all"></span>
+ <svg tasklist-icon size="small" class="octicon"></svg>
<span [textContent]="text.buttons.selectAll"></span>
</button>
</div>
@@ -97,7 +101,7 @@
[disabled]="selectedFileCount === 0"
(click)="createSelectedFileLinks()"
>
- <span class="spot-icon spot-icon_add-link"></span>
+ <svg link-icon size="small"></svg>
<span>{{text.buttons.submit(selectedFileCount)}}</span>
</button>
</div>
diff --git a/frontend/src/app/shared/components/storages/icons.mapping.ts b/frontend/src/app/shared/components/storages/icons.mapping.ts
index ec7cf973f6b..e0077e486f3 100644
--- a/frontend/src/app/shared/components/storages/icons.mapping.ts
+++ b/frontend/src/app/shared/components/storages/icons.mapping.ts
@@ -29,84 +29,84 @@
import { nextcloud } from 'core-app/shared/components/storages/storages-constants.const';
export interface IFileIcon {
- icon:'image1'|'movie'|'file-text'|'export-pdf-descr'|'file-doc'|'file-sheet'|'file-presentation'|'folder'|'ticket'|'inbox'
+ icon:'file'|'file-media'
clazz:'pdf'|'img'|'txt'|'doc'|'sheet'|'presentation'|'form'|'primary'|'mov'|'default'
}
export const fileIconMappings:Record<string, IFileIcon> = {
- 'application/pdf': { icon: 'export-pdf-descr', clazz: 'pdf' },
+ 'application/pdf': { icon: 'file', clazz: 'pdf' },
- 'image/jpeg': { icon: 'image1', clazz: 'img' },
- 'image/png': { icon: 'image1', clazz: 'img' },
- 'image/gif': { icon: 'image1', clazz: 'img' },
- 'image/svg+xml': { icon: 'image1', clazz: 'img' },
- 'image/tiff': { icon: 'image1', clazz: 'img' },
- 'image/bmp': { icon: 'image1', clazz: 'img' },
- 'image/webp': { icon: 'image1', clazz: 'img' },
- 'image/heic': { icon: 'image1', clazz: 'img' },
- 'image/heif': { icon: 'image1', clazz: 'img' },
- 'image/avif': { icon: 'image1', clazz: 'img' },
- 'image/cgm': { icon: 'image1', clazz: 'img' },
+ 'image/jpeg': { icon: 'file-media', clazz: 'img' },
+ 'image/png': { icon: 'file-media', clazz: 'img' },
+ 'image/gif': { icon: 'file-media', clazz: 'img' },
+ 'image/svg+xml': { icon: 'file-media', clazz: 'img' },
+ 'image/tiff': { icon: 'file-media', clazz: 'img' },
+ 'image/bmp': { icon: 'file-media', clazz: 'img' },
+ 'image/webp': { icon: 'file-media', clazz: 'img' },
+ 'image/heic': { icon: 'file-media', clazz: 'img' },
+ 'image/heif': { icon: 'file-media', clazz: 'img' },
+ 'image/avif': { icon: 'file-media', clazz: 'img' },
+ 'image/cgm': { icon: 'file-media', clazz: 'img' },
- 'text/plain': { icon: 'file-text', clazz: 'txt' },
- 'text/markdown': { icon: 'file-text', clazz: 'txt' },
- 'text/html': { icon: 'file-text', clazz: 'txt' },
- 'application/rtf': { icon: 'file-text', clazz: 'txt' },
- 'application/xml': { icon: 'file-text', clazz: 'txt' },
- 'application/xhtml+xml': { icon: 'file-text', clazz: 'txt' },
- 'application/x-tex': { icon: 'file-text', clazz: 'txt' },
+ 'text/plain': { icon: 'file', clazz: 'txt' },
+ 'text/markdown': { icon: 'file', clazz: 'txt' },
+ 'text/html': { icon: 'file', clazz: 'txt' },
+ 'application/rtf': { icon: 'file', clazz: 'txt' },
+ 'application/xml': { icon: 'file', clazz: 'txt' },
+ 'application/xhtml+xml': { icon: 'file', clazz: 'txt' },
+ 'application/x-tex': { icon: 'file', clazz: 'txt' },
- 'application/vnd.oasis.opendocument.text': { icon: 'file-doc', clazz: 'doc' },
- 'application/vnd.oasis.opendocument.text-template': { icon: 'file-doc', clazz: 'doc' },
- 'application/msword': { icon: 'file-doc', clazz: 'doc' },
- 'application/vnd.apple.pages': { icon: 'file-doc', clazz: 'doc' },
- 'application/vnd.stardivision.writer': { icon: 'file-doc', clazz: 'doc' },
- 'application/x-abiword': { icon: 'file-doc', clazz: 'doc' },
- 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': { icon: 'file-doc', clazz: 'doc' },
- 'font/otf': { icon: 'file-doc', clazz: 'doc' },
+ 'application/vnd.oasis.opendocument.text': { icon: 'file', clazz: 'doc' },
+ 'application/vnd.oasis.opendocument.text-template': { icon: 'file', clazz: 'doc' },
+ 'application/msword': { icon: 'file', clazz: 'doc' },
+ 'application/vnd.apple.pages': { icon: 'file', clazz: 'doc' },
+ 'application/vnd.stardivision.writer': { icon: 'file', clazz: 'doc' },
+ 'application/x-abiword': { icon: 'file', clazz: 'doc' },
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': { icon: 'file', clazz: 'doc' },
+ 'font/otf': { icon: 'file', clazz: 'doc' },
- 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': { icon: 'file-sheet', clazz: 'sheet' },
- 'application/vnd.oasis.opendocument.spreadsheet': { icon: 'file-sheet', clazz: 'sheet' },
- 'application/vnd.oasis.opendocument.spreadsheet-template': { icon: 'file-sheet', clazz: 'sheet' },
- 'application/vnd.ms-excel': { icon: 'file-sheet', clazz: 'sheet' },
- 'application/vnd.stardivision.calc': { icon: 'file-sheet', clazz: 'sheet' },
- 'application/vnd.apple.numbers': { icon: 'file-sheet', clazz: 'sheet' },
- 'application/x-starcalc': { icon: 'file-sheet', clazz: 'sheet' },
- 'application/x-quattro-pro': { icon: 'file-sheet', clazz: 'sheet' },
- 'application/csv': { icon: 'file-sheet', clazz: 'sheet' },
+ 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': { icon: 'file', clazz: 'sheet' },
+ 'application/vnd.oasis.opendocument.spreadsheet': { icon: 'file', clazz: 'sheet' },
+ 'application/vnd.oasis.opendocument.spreadsheet-template': { icon: 'file', clazz: 'sheet' },
+ 'application/vnd.ms-excel': { icon: 'file', clazz: 'sheet' },
+ 'application/vnd.stardivision.calc': { icon: 'file', clazz: 'sheet' },
+ 'application/vnd.apple.numbers': { icon: 'file', clazz: 'sheet' },
+ 'application/x-starcalc': { icon: 'file', clazz: 'sheet' },
+ 'application/x-quattro-pro': { icon: 'file', clazz: 'sheet' },
+ 'application/csv': { icon: 'file', clazz: 'sheet' },
- 'application/vnd.oasis.opendocument.presentation': { icon: 'file-presentation', clazz: 'presentation' },
- 'application/vnd.oasis.opendocument.presentation-template': { icon: 'file-presentation', clazz: 'presentation' },
- 'application/vnd.apple.keynote': { icon: 'file-presentation', clazz: 'presentation' },
- 'application/vnd.ms-powerpoint': { icon: 'file-presentation', clazz: 'presentation' },
+ 'application/vnd.oasis.opendocument.presentation': { icon: 'file', clazz: 'presentation' },
+ 'application/vnd.oasis.opendocument.presentation-template': { icon: 'file', clazz: 'presentation' },
+ 'application/vnd.apple.keynote': { icon: 'file', clazz: 'presentation' },
+ 'application/vnd.ms-powerpoint': { icon: 'file', clazz: 'presentation' },
'application/vnd.openxmlformats-officedocument.presentationml.presentation': {
- icon: 'file-presentation',
+ icon: 'file',
clazz: 'presentation',
},
- 'application/vnd.stardivision.impress': { icon: 'file-presentation', clazz: 'presentation' },
- 'application/mathematica': { icon: 'file-presentation', clazz: 'presentation' },
+ 'application/vnd.stardivision.impress': { icon: 'file', clazz: 'presentation' },
+ 'application/mathematica': { icon: 'file', clazz: 'presentation' },
- 'video/mp4': { icon: 'movie', clazz: 'mov' },
- 'video/x-m4v': { icon: 'movie', clazz: 'mov' },
- 'video/avi': { icon: 'movie', clazz: 'mov' },
- 'video/quicktime': { icon: 'movie', clazz: 'mov' },
- 'video/webm': { icon: 'movie', clazz: 'mov' },
- 'video/mpg': { icon: 'movie', clazz: 'mov' },
- 'video/x-matroska': { icon: 'movie', clazz: 'mov' },
- 'video/mp1s': { icon: 'movie', clazz: 'mov' },
- 'video/mp2p': { icon: 'movie', clazz: 'mov' },
- 'video/3gpp': { icon: 'movie', clazz: 'mov' },
- 'video/3gpp-tt': { icon: 'movie', clazz: 'mov' },
- 'video/3gpp-2': { icon: 'movie', clazz: 'mov' },
+ 'video/mp4': { icon: 'file-media', clazz: 'mov' },
+ 'video/x-m4v': { icon: 'file-media', clazz: 'mov' },
+ 'video/avi': { icon: 'file-media', clazz: 'mov' },
+ 'video/quicktime': { icon: 'file-media', clazz: 'mov' },
+ 'video/webm': { icon: 'file-media', clazz: 'mov' },
+ 'video/mpg': { icon: 'file-media', clazz: 'mov' },
+ 'video/x-matroska': { icon: 'file-media', clazz: 'mov' },
+ 'video/mp1s': { icon: 'file-media', clazz: 'mov' },
+ 'video/mp2p': { icon: 'file-media', clazz: 'mov' },
+ 'video/3gpp': { icon: 'file-media', clazz: 'mov' },
+ 'video/3gpp-tt': { icon: 'file-media', clazz: 'mov' },
+ 'video/3gpp-2': { icon: 'file-media', clazz: 'mov' },
- 'application/x-op-directory': { icon: 'folder', clazz: 'primary' },
- 'application/x-op-drive': { icon: 'inbox', clazz: 'primary' },
+ 'application/x-op-directory': { icon: 'file', clazz: 'primary' },
+ 'application/x-op-drive': { icon: 'file', clazz: 'primary' },
- default: { icon: 'ticket', clazz: 'default' },
+ default: { icon: 'file', clazz: 'default' },
};
export const storageIconMappings:Record<string, string> = {
[nextcloud]: 'nextcloud-circle',
- default: 'hosting',
+ default: 'cloud',
};
diff --git a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html
index 9fb30308ad8..206a34a750e 100644
--- a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html
+++ b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html
@@ -19,7 +19,7 @@
class="spot-link op-toast--close"
(click)="closeAlert()"
>
- <span class="spot-icon spot-icon_close"></span>
+ <svg x-icon size="small"></svg>
</button>
</div>
</div>
@@ -55,7 +55,7 @@
<ng-template #emptyTemplate>
<div class="spot-body-small spot-body-small_bold op-file-picker--info">
- <span class="spot-icon spot-icon_folder-open op-file-picker--info-icon"></span>
+ <svg file-directory-fill-icon size="small" class="op-file-picker--info-icon"></svg>
<span [textContent]="text.content.empty"></span>
<span class="spot-body-small op-file-picker--info-sub-text" [textContent]="text.content.emptyHint"></span>
</div>
@@ -63,7 +63,7 @@
<ng-template #notFoundTemplate>
<div class="spot-body-small spot-body-small_bold op-file-picker--info">
- <span class="spot-icon spot-icon_remove-link op-file-picker--info-icon"></span>
+ <svg x-circle-icon size="small" class="op-file-picker--info-icon"></svg>
<span [textContent]="text.content.noConnection(storageType)"></span>
<span class="spot-body-small op-file-picker--info-sub-text"
[textContent]="text.content.noConnectionHint(storageType)"></span>
@@ -79,7 +79,7 @@
[disabled]="!canCreateFolder"
(click)="createAndNavigateToFolder()"
>
- <span class="spot-icon spot-icon_folder-add op-files-tab--icon op-files-tab--icon_forums"></span>
+ <svg file-directory-fill-icon size="small" class="op-files-tab--icon op-files-tab--icon_forums"></svg>
<span [textContent]="text.buttons.newFolder"></span>
</button>
</div>
diff --git a/frontend/src/app/shared/components/storages/openproject-storages.module.ts b/frontend/src/app/shared/components/storages/openproject-storages.module.ts
index e9cc43ac968..30366f43096 100644
--- a/frontend/src/app/shared/components/storages/openproject-storages.module.ts
+++ b/frontend/src/app/shared/components/storages/openproject-storages.module.ts
@@ -64,12 +64,39 @@ import {
StorageLoginButtonComponent,
} from 'core-app/shared/components/storages/storage-login-button/storage-login-button.component';
+import {
+ CloudIconComponent,
+ DownloadIconComponent,
+ FileDirectoryFillIconComponent,
+ FileDirectoryOpenFillIconComponent,
+ ServerIconComponent,
+ FileIconComponent,
+ FileMediaIconComponent,
+ TasklistIconComponent,
+ LinkIconComponent,
+ UploadIconComponent,
+ LinkExternalIconComponent,
+ UnlinkIconComponent
+} from '@openproject/octicons-angular';
+
@NgModule({
imports: [
CommonModule,
IconModule,
OpSpotModule,
OpSharedModule,
+ CloudIconComponent,
+ DownloadIconComponent,
+ FileDirectoryFillIconComponent,
+ FileDirectoryOpenFillIconComponent,
+ ServerIconComponent,
+ FileIconComponent,
+ FileMediaIconComponent,
+ TasklistIconComponent,
+ LinkIconComponent,
+ LinkExternalIconComponent,
+ UploadIconComponent,
+ UnlinkIconComponent
],
declarations: [
StorageComponent,
diff --git a/frontend/src/app/shared/components/storages/storage-file-list-item/storage-file-list-item.html b/frontend/src/app/shared/components/storages/storage-file-list-item/storage-file-list-item.html
index a56ef313a37..b500614fc3a 100644
--- a/frontend/src/app/shared/components/storages/storage-file-list-item/storage-file-list-item.html
+++ b/frontend/src/app/shared/components/storages/storage-file-list-item/storage-file-list-item.html
@@ -7,11 +7,16 @@
class="spot-body-small"
>{{content.tooltip}}</p>
+ <!-- eslint-disable-next-line @angular-eslint/template/label-has-associated-control -->
<label
slot="trigger"
class="spot-list--item-action"
data-test-selector="op-files-picker-modal--list-item"
(click)="enterDirectoryOnLabel($event)"
+ (keydown.enter)="enterDirectoryOnLabel($event)"
+ (keydown.space)="enterDirectoryOnLabel($event)"
+ tabindex="0"
+ role="button"
[ngClass]="{
'spot-list--item-action_disabled': content.disabled,
'op-file-list--item-action_view-not-allowed': content.isConstrained
@@ -24,12 +29,38 @@
[disabled]="content.disabled"
></spot-checkbox>
- <div
- class="spot-list--item-title op-file-list--item-title"
- >
- <span
- class="spot-icon spot-icon_{{content.icon.icon}} op-files-tab--icon op-files-tab--icon_{{content.icon.clazz}}"
- ></span>
+ <div class="spot-list--item-title op-file-list--item-title">
+ <ng-container *ngIf="content.isDirectory; else fileIconTemplate">
+ <svg
+ *ngIf="content.mimeType === 'application/x-op-drive'; else folderIconTemplate"
+ server-icon
+ size="small"
+ class="op-files-tab--icon op-files-tab--icon_primary"
+ ></svg>
+ <ng-template #folderIconTemplate>
+ <svg
+ file-directory-fill-icon
+ size="small"
+ class="op-files-tab--icon op-files-tab--icon_primary"
+ ></svg>
+ </ng-template>
+ </ng-container>
+ <ng-template #fileIconTemplate>
+ <ng-container [ngSwitch]="content.icon.icon">
+ <svg *ngSwitchCase="'file'"
+ file-icon
+ size="small"
+ class="op-files-tab--icon op-files-tab--icon_{{content.icon.clazz}}"></svg>
+ <svg *ngSwitchCase="'file-media'"
+ file-media-icon
+ size="small"
+ class="op-files-tab--icon op-files-tab--icon_{{content.icon.clazz}}"></svg>
+ <svg *ngSwitchDefault
+ file-icon
+ size="small"
+ class="op-files-tab--icon op-files-tab--icon_{{content.icon.clazz}}"></svg>
+ </ng-container>
+ </ng-template>
<span [textContent]="content.name"></span>
</div>
@@ -54,8 +85,10 @@
class="spot-link op-file-list--item-button"
data-test-selector="op-files-picker-modal--list-item-caret"
(click)="content.enterDirectory()"
+ (keydown.enter)="content.enterDirectory()"
+ (keydown.space)="content.enterDirectory()"
>
- <span class="spot-icon spot-icon_arrow-right2"></span>
+ <svg chevron-right-icon size="small"></svg>
</button>
</label>
</spot-tooltip>
diff --git a/frontend/src/app/shared/components/storages/storage-information/storage-information.html b/frontend/src/app/shared/components/storages/storage-information/storage-information.html
index b399aee676d..2d9022b7d97 100644
--- a/frontend/src/app/shared/components/storages/storage-information/storage-information.html
+++ b/frontend/src/app/shared/components/storages/storage-information/storage-information.html
@@ -1,4 +1,6 @@
-<span class="spot-icon spot-icon_{{content.iconClass}} info-icon-box"></span>
+<svg *ngIf="content.iconClass === 'warning'" alert-fill-icon size="small" class="info-icon-box"></svg>
+<svg *ngIf="content.iconClass === 'info'" info-icon size="small" class="info-icon-box"></svg>
+<svg *ngIf="content.iconClass !== 'warning' && content.iconClass !== 'info'" question-icon size="small" class="info-icon-box"></svg>
<div
class="text-box"
diff --git a/frontend/src/app/shared/components/storages/storage-login-button/storage-login-button.component.html b/frontend/src/app/shared/components/storages/storage-login-button/storage-login-button.component.html
index 45ccf0c060e..561296e0307 100644
--- a/frontend/src/app/shared/components/storages/storage-login-button/storage-login-button.component.html
+++ b/frontend/src/app/shared/components/storages/storage-login-button/storage-login-button.component.html
@@ -3,5 +3,5 @@
(click)="login()"
>
<span>{{label}}</span>
- <span class="spot-icon spot-icon_external-link"></span>
+ <svg link-external-icon size="small"></svg>
</button>
diff --git a/frontend/src/app/shared/components/storages/storage/storage.component.html b/frontend/src/app/shared/components/storages/storage/storage.component.html
index c4e05e1a104..68a29ea6365 100644
--- a/frontend/src/app/shared/components/storages/storage/storage.component.html
+++ b/frontend/src/app/shared/components/storages/storage/storage.component.html
@@ -2,18 +2,20 @@
*ngIf="resource"
>
<div class=op-tab-content--header>
- <span
- class="op-tab-content--header-icon spot-icon spot-icon_{{icon.storageHeader((storage | async)?._links.type.href)}} op-files-tab--icon op-files-tab--icon_primary"
- ></span>
+ <svg
+ class="op-tab-content--header-icon op-files-tab--icon op-files-tab--icon_primary"
+ cloud-icon
+ size="small"
+ ></svg>
<span class="op-tab-content--header-text" [textContent]="(storage | async)?.name"></span>
<a *ngIf="openStorageLink"
- class="op-tab-content--header-action spot-link"
+ class="op-tab-content--header-action"
aria-label="{{text.openStorage(storageType | async)}}"
[title]="text.openStorage(storageType | async)"
[href]="openStorageLink"
target="_blank"
>
- <span class="spot-icon spot-icon_external-link"></span>
+ <svg link-external-icon size="small"></svg>
</a>
</div>
@@ -79,9 +81,7 @@
(drop)="onDropFiles($event)"
(click)="triggerFileInput()"
>
- <span
- class="spot-icon spot-icon_upload-arrow op-file-section--drop-box-icon"
- ></span>
+ <svg upload-icon size="small" class="op-file-section--drop-box-icon"></svg>
<span
*ngIf="(fileLinks | async)?.length > 0"
class="op-file-section--drop-box-text"
@@ -105,7 +105,7 @@
data-test-selector="op-storage--upload-file-button"
(click)="triggerFileInput()"
>
- <span class="spot-icon spot-icon_upload-arrow"></span>
+ <svg upload-icon size="small" class="octicon"></svg>
<span [textContent]="text.actions.uploadFile"></span>
</button>
<button
@@ -115,7 +115,7 @@
data-test-selector="op-storage--link-existing-file-button"
(click)="openLinkFilesDialog()"
>
- <span class="spot-icon spot-icon_add-link"></span>
+ <svg link-icon size="small" class="octicon"></svg>
<span [textContent]="text.actions.linkExisting"></span>
</button>
</div>
diff --git a/frontend/src/app/spot/components/breadcrumbs/breadcrumbs.component.html b/frontend/src/app/spot/components/breadcrumbs/breadcrumbs.component.html
index d968f87b740..f5f424cc68f 100644
--- a/frontend/src/app/spot/components/breadcrumbs/breadcrumbs.component.html
+++ b/frontend/src/app/spot/components/breadcrumbs/breadcrumbs.component.html
@@ -17,7 +17,15 @@
[title]="crumb.text"
(click)="crumb.navigate()"
>
- <span *ngIf="crumb.icon" class="spot-icon spot-icon_{{crumb.icon}}"></span>
+ <ng-container *ngIf="crumb.icon">
+ <svg
+ *ngIf="crumb.icon === 'hosting' || crumb.icon === 'nextcloud-circle' || crumb.icon === 'cloud'"
+ cloud-icon
+ size="small"
+ class="octicon"
+ ></svg>
+ <span *ngIf="crumb.icon !== 'hosting' && crumb.icon !== 'nextcloud-circle' && crumb.icon !== 'cloud'" class="spot-icon spot-icon_{{crumb.icon}}"></span>
+ </ng-container>
<span [textContent]="crumb.text" class="spot-breadcrumbs--crumb-action-item-text"></span>
<span class="spot-breadcrumbs--crumb-action-item-dots"></span>
</button>
@@ -37,7 +45,15 @@
class="spot-breadcrumbs--crumb spot-breadcrumbs--crumb_last"
data-test-selector="op-breadcrumb"
>
- <span *ngIf="crumb.icon" class="spot-icon spot-icon_{{crumb.icon}}"></span>
+ <ng-container *ngIf="crumb.icon">
+ <svg
+ *ngIf="crumb.icon === 'hosting' || crumb.icon === 'nextcloud-circle' || crumb.icon === 'cloud'"
+ cloud-icon
+ size="small"
+ class="octicon"
+ ></svg>
+ <span *ngIf="crumb.icon !== 'hosting' && crumb.icon !== 'nextcloud-circle' && crumb.icon !== 'cloud'" class="spot-icon spot-icon_{{crumb.icon}}"></span>
+ </ng-container>
<span
class="spot-breadcrumbs--crumb-action-item-text"
[textContent]="crumb.text"
diff --git a/frontend/src/app/spot/spot.module.ts b/frontend/src/app/spot/spot.module.ts
index 742c538715b..5bca8dcd2a6 100644
--- a/frontend/src/app/spot/spot.module.ts
+++ b/frontend/src/app/spot/spot.module.ts
@@ -19,6 +19,7 @@ import { SpotFormBindingDirective } from './components/form-field/form-binding.d
import { SpotBreadcrumbsComponent } from './components/breadcrumbs/breadcrumbs.component';
import { SpotSelectorFieldComponent } from './components/selector-field/selector-field.component';
import { SpotDropModalPortalComponent } from './components/drop-modal/drop-modal-portal.component';
+import { CloudIconComponent } from '@openproject/octicons-angular';
@NgModule({
imports: [
@@ -26,6 +27,7 @@ import { SpotDropModalPortalComponent } from './components/drop-modal/drop-modal
ReactiveFormsModule,
CommonModule,
A11yModule,
+ CloudIconComponent,
],
providers: [
diff --git a/frontend/src/app/spot/styles/sass/components/link.sass b/frontend/src/app/spot/styles/sass/components/link.sass
index 8471ef21253..fdca359fd85 100644
--- a/frontend/src/app/spot/styles/sass/components/link.sass
+++ b/frontend/src/app/spot/styles/sass/components/link.sass
@@ -33,6 +33,9 @@
&:last-child:not(:first-child)
margin-left: $spot-spacing-0_25
+ &.octicon-link
+ display: inline-block
+
// Ensure op-icon within a link gets inline-block
// to avoid it receiving any text-decoration on hover
.op-icon--wrapper
diff --git a/frontend/src/global_styles/content/work_packages/shared/_file_picker.sass b/frontend/src/global_styles/content/work_packages/shared/_file_picker.sass
index 961535c5b70..72a55a24c15 100644
--- a/frontend/src/global_styles/content/work_packages/shared/_file_picker.sass
+++ b/frontend/src/global_styles/content/work_packages/shared/_file_picker.sass
@@ -56,3 +56,6 @@
height: 9.5rem
font-size: 5.5rem
margin-bottom: $spot-spacing-0_25
+
+ .octicon
+ margin-right: $spot-spacing-0_25
diff --git a/frontend/src/global_styles/content/work_packages/tabs/_files_tab.sass b/frontend/src/global_styles/content/work_packages/tabs/_files_tab.sass
index 4e9c9697067..bc8e78b9b48 100644
--- a/frontend/src/global_styles/content/work_packages/tabs/_files_tab.sass
+++ b/frontend/src/global_styles/content/work_packages/tabs/_files_tab.sass
@@ -101,3 +101,6 @@
&_clip
color: #333333
+
+ .octicon
+ margin-right: $spot-spacing-0_25