Browse Source

update mdi.svg icon and remove some icon from app.component

pull/5186/head
ArtemDzhereleiko 5 years ago
parent
commit
d42212d96f
  1. 25
      ui-ngx/src/app/app.component.ts
  2. 2
      ui-ngx/src/app/modules/home/components/event/event-table-config.ts
  3. 12
      ui-ngx/src/app/modules/home/components/widget/data-keys.component.html
  4. 2
      ui-ngx/src/assets/mdi.svg

25
ui-ngx/src/app/app.component.ts

@ -50,31 +50,6 @@ export class AppComponent implements OnInit {
this.matIconRegistry.addSvgIconSetInNamespace('mdi',
this.domSanitizer.bypassSecurityTrustResourceUrl('./assets/mdi.svg'));
this.matIconRegistry.addSvgIconLiteral(
'alpha-a-circle-outline',
this.domSanitizer.bypassSecurityTrustHtml(
'<svg viewBox="0 0 24 24"><path d="M11,7H13A2,2 0 0,1 15,9V17H13V13H11V17H9V9A2,2 0 0,' +
'1 11,7M11,9V11H13V9H11M12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4A8,8 0 ' +
'0,0 4,12A8,8 0 0,0 12,20M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A1' +
'0,10 0 0,1 2,12A10,10 0 0,1 12,2Z" /></svg>'
)
);
this.matIconRegistry.addSvgIconLiteral(
'alpha-e-circle-outline',
this.domSanitizer.bypassSecurityTrustHtml(
'<svg viewBox="0 0 24 24"><path d="M9,7H15V9H11V11H15V13H11V15H15V17H9V7M12,2A10,10 0 0,' +
'1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 ' +
'0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4Z" /></svg>'
)
);
this.matIconRegistry.addSvgIconLiteral(
'filter-variant-remove',
this.domSanitizer.bypassSecurityTrustHtml(
'<svg viewBox="0 0 24 24"><path d="M21 8H3V6h18v2m-7.19 8H10v2h3.09c.12-.72.37-1.39.72-2M18 11H6v2h12v-2m3.12 4.46L19 17.59l-2.12-2.13-1.41 1.42L17.59 19l-2.12 2.12 1.41 1.42L19 20.41l2.12 2.13 1.42-1.42L20.41 19l2.13-2.12-1.42-1.42z"/></svg>'
)
);
this.matIconRegistry.addSvgIconLiteral(
'google-logo',
this.domSanitizer.bypassSecurityTrustHtml(

2
ui-ngx/src/app/modules/home/components/event/event-table-config.ts

@ -121,7 +121,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
this.headerActionDescriptors.push({
name: this.translate.instant('event.clear-filter'),
icon: 'filter-variant-remove',
icon: 'mdi:filter-variant-remove',
isMdiIcon: true,
isEnabled: () => !isEqual(this.filterParams, {}),
onAction: ($event) => {

12
ui-ngx/src/app/modules/home/components/widget/data-keys.component.html

@ -41,13 +41,13 @@
matTooltip="{{'datakey.attributes' | translate }}"
matTooltipPosition="above">
<mat-icon class="tb-mat-20"
svgIcon="alpha-a-circle-outline"></mat-icon>
svgIcon="mdi:alpha-a-circle-outline"></mat-icon>
</span>
<span *ngIf="key.type === dataKeyTypes.entityField"
matTooltip="{{'datakey.entity-field' | translate }}"
matTooltipPosition="above">
<mat-icon class="tb-mat-20"
svgIcon="alpha-e-circle-outline"></mat-icon>
svgIcon="mdi:alpha-e-circle-outline"></mat-icon>
</span>
<span *ngIf="key.type === dataKeyTypes.timeseries"
matTooltip="{{'datakey.timeseries' | translate }}"
@ -103,13 +103,13 @@
matTooltip="{{'datakey.attributes' | translate }}"
matTooltipPosition="above">
<mat-icon class="tb-mat-16"
svgIcon="alpha-a-circle-outline"></mat-icon>
svgIcon="mdi:alpha-a-circle-outline"></mat-icon>
</span>
<span *ngIf="key.type === dataKeyTypes.entityField"
matTooltip="{{'datakey.entity-field' | translate }}"
matTooltipPosition="above">
<mat-icon class="tb-mat-16"
svgIcon="alpha-e-circle-outline"></mat-icon>
svgIcon="mdi:alpha-e-circle-outline"></mat-icon>
</span>
<span *ngIf="key.type === dataKeyTypes.timeseries"
matTooltip="{{'datakey.timeseries' | translate }}"
@ -146,14 +146,14 @@
matTooltipPosition="above">
<mat-icon (click)="createKey(searchText, dataKeyTypes.attribute)"
class="tb-mat-16"
svgIcon="alpha-a-circle-outline"></mat-icon>
svgIcon="mdi:alpha-a-circle-outline"></mat-icon>
</span>
<span *ngIf="widgetType == widgetTypes.latest || widgetType == widgetTypes.alarm"
matTooltip="{{'datakey.entity-field' | translate }}"
matTooltipPosition="above">
<mat-icon (click)="createKey(searchText, dataKeyTypes.entityField)"
class="tb-mat-16"
svgIcon="alpha-e-circle-outline"></mat-icon>
svgIcon="mdi:alpha-e-circle-outline"></mat-icon>
</span>
<span matTooltip="{{'datakey.timeseries' | translate }}"
matTooltipPosition="above">

2
ui-ngx/src/assets/mdi.svg

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 2.3 MiB

Loading…
Cancel
Save