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.

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

[ACS-5166] Changes to Digital workspace new UI for better experience #8640

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions lib/core/src/lib/assets/images/filetype_ms_document.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions lib/core/src/lib/assets/images/filetype_ms_presentation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions lib/core/src/lib/assets/images/filetype_ms_spreadsheet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion lib/core/src/lib/icon/icon.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
</ng-container>

<ng-template #default>
<mat-icon [color]="color" aria-hidden="true">{{ value }}</mat-icon>
<mat-icon *ngIf="isOutlined; else: outlineDefault" [color]="color" aria-hidden="true" fontSet="mat-icons-outlined">{{ value }}</mat-icon>
<ng-template #outlineDefault>
<mat-icon [color]="color" aria-hidden="true">{{ value }}</mat-icon>
</ng-template>
</ng-template>
3 changes: 3 additions & 0 deletions lib/core/src/lib/icon/icon.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { ThemePalette } from '@angular/material/core';
export class IconComponent {
private _value = '';
private _isCustom = false;
isOutlined = false;

/** Theme color palette for the component. */
@Input()
Expand All @@ -48,6 +49,8 @@ export class IconComponent {
set value(value: string) {
this._value = value || 'settings';
this._isCustom = this._value.includes(':');
this.isOutlined = this._value.includes('_outline');
this._value = this._value.replace('_outline','');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is hacking of the old material icons font, and is introducing IDs that are invalid for the new Material Symbols font. this is also not going to work for cases like

<mat-icon class="adf-error-icon">error_outline</mat-icon>

}

get isCustom(): boolean {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
id="adf-notification-history-open-button"
(menuOpened)="onMenuOpened()">
<mat-icon matBadge="&#8288;"
[matBadgeHidden]="!notifications.length"
matBadgeColor="accent"
matBadgeSize="small">notifications</mat-icon>
[matBadgeHidden]="!notifications.length"
matBadgeColor="warn"
matBadgeSize="small"
fontSet="mat-icons-outlined">notifications</mat-icon>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this PR, there is no outlined font in the ADF, you are breaking the component

</button>
<mat-menu #menu="matMenu"
[xPosition]="menuPositionX"
Expand Down