arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #235 in TEA/mina-sidor-fa-web from feature/TV-857-digi-ng-icon-custom to develop

Browse Source 
Squashed commit of the following:

commit f09e5111d82dce884f83ebf1150a04890c165f39
Merge: 2184d793 4b4e5a64
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Mon Nov 1 14:21:47 2021 +0100

    Merge branch 'develop' into feature/TV-857-digi-ng-icon-custom

commit 2184d7939f92956cb6f5aedc51a9f694692cb9a5
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Fri Oct 29 14:47:29 2021 +0200

    Created a ui-icon-custom and removed references to digi-ng-icon-custom
This commit is contained in:
Nikola Holst Nikolic
2021-11-01 14:22:13 +01:00
parent 4b4e5a64b2
commit a48053d20d
8 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/mina-sidor-fa/src/app/components/toast-list/toast/toast.module.ts
View File

@@ -1,7 +1,3 @@
import { DigiNgIconExclamationCircleModule } from '@af/digi-ng/_icon/icon-exclamation-circle';
import { DigiNgIconExclamationTriangleModule } from '@af/digi-ng/_icon/icon-exclamation-triangle';
import { DigiNgIconInfoCircleRegModule } from '@af/digi-ng/_icon/icon-info-circle-reg';
import { DigiNgIconXModule } from '@af/digi-ng/_icon/icon-x';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { IconModule } from '@msfa-shared/components/icon/icon.module';
@@ -12,10 +8,6 @@ import { ToastComponent } from './toast.component';
declarations: [ToastComponent],
imports: [
CommonModule,
DigiNgIconXModule,
DigiNgIconExclamationCircleModule,
DigiNgIconExclamationTriangleModule,
DigiNgIconInfoCircleRegModule,
IconModule,
],
exports: [ToastComponent],

6
apps/mina-sidor-fa/src/app/shared/components/icon/icon.component.html
View File

@@ -1,4 +1,4 @@
<digi-ng-icon-custom *ngIf="isCustomIcon; else DigiNgIcon" aria-hidden="true" class="icon" [ngClass]="[iconClass]">
<ui-icon-custom *ngIf="isCustomIcon; else digiIcon" aria-hidden="true" class="icon" [ngClass]="[iconClass]">
<svg *ngIf="icon === iconType.HOME" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" width="25" height="25">
<path
d="M280.37 148.26L96 300.11V464a16 16 0 0 0 16 16l112.06-.29a16 16 0 0 0 15.92-16V368a16 16 0 0 1 16-16h64a16 16 0 0 1 16 16v95.64a16 16 0 0 0 16 16.05L464 480a16 16 0 0 0 16-16V300L295.67 148.26a12.19 12.19 0 0 0-15.3 0zM571.6 251.47L488 182.56V44.05a12 12 0 0 0-12-12h-56a12 12 0 0 0-12 12v72.61L318.47 43a48 48 0 0 0-61 0L4.34 251.47a12 12 0 0 0-1.6 16.9l25.5 31A12 12 0 0 0 45.15 301l235.22-193.74a12.19 12.19 0 0 1 15.3 0L530.9 301a12 12 0 0 0 16.9-1.6l25.5-31a12 12 0 0 0-1.7-16.93z"
@@ -57,9 +57,9 @@
d="M384 112v352c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h80c0-35.29 28.71-64 64-64s64 28.71 64 64h80c26.51 0 48 21.49 48 48zM192 40c-13.255 0-24 10.745-24 24s10.745 24 24 24 24-10.745 24-24-10.745-24-24-24m96 114v-20a6 6 0 0 0-6-6H102a6 6 0 0 0-6 6v20a6 6 0 0 0 6 6h180a6 6 0 0 0 6-6z"
></path>
</svg>
</digi-ng-icon-custom>
</ui-icon-custom>
<ng-template #DigiNgIcon>
<ng-template #digiIcon>
<ng-container [ngSwitch]="icon">
<digi-icon-user-alt *ngSwitchCase="iconType.USER" [ngClass]="iconClass"></digi-icon-user-alt>
<digi-icon-users-solid *ngSwitchCase="iconType.USERS" [ngClass]="iconClass"></digi-icon-users-solid>

10
apps/mina-sidor-fa/src/app/shared/components/icon/icon.component.scss
View File

@@ -6,18 +6,18 @@
.icon {
&--s {
@include msfa__digi-ng-icon(0.875em);
@include msfa__ui-icon(0.875em);
}
&--m {
@include msfa__digi-ng-icon(1em);
@include msfa__ui-icon(1em);
}
&--l {
@include msfa__digi-ng-icon(1.25em);
@include msfa__ui-icon(1.25em);
}
&--xl {
@include msfa__digi-ng-icon(1.5em);
@include msfa__ui-icon(1.5em);
}
&--xxl {
@include msfa__digi-ng-icon(2em);
@include msfa__ui-icon(2em);
}
}