From d6ee7fd72f38364291120fd40213b69241ec7cd1 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Thu, 3 Apr 2025 14:12:30 +0200
Subject: [PATCH] OZG-7707 rename color to fill for all icons
---
.../apps/admin/src/app/app.component.html | 2 +-
alfa-client/apps/demo/src/app/app.component.html | 16 ++++++++--------
...aggregation-mapping-field-form.component.html | 2 +-
.../organisations-einheit-list.component.html | 2 +-
...dmin-delete-open-dialog-button.component.html | 2 +-
.../bescheid-wizard-container.component.html | 2 +-
...-wizard-antrag-bescheiden-form.component.html | 2 +-
...wizard-cancel-dialog-container.component.html | 2 +-
...-wizard-create-document-button.component.html | 2 +-
...-wizard-upload-document-button.component.html | 2 +-
.../beschieden-date-container.component.html | 2 +-
.../binary-file2/binary-file2.component.html | 2 +-
.../accessibility-button.component.ts | 2 +-
.../bescheid-status-text.component.ts | 2 +-
.../ui/back-button/back-button.component.html | 2 +-
...-user-profile-button-container.component.html | 2 +-
.../abschliessen-button.component.html | 2 +-
.../annehmen-button.component.html | 2 +-
.../vorgang-archive-status.component.html | 2 +-
.../erledigen-button-container.component.html | 2 +-
...edereroeffnen-button-container.component.html | 2 +-
21 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html
index e6cf848872..d383d837c6 100644
--- a/alfa-client/apps/admin/src/app/app.component.html
+++ b/alfa-client/apps/admin/src/app/app.component.html
@@ -54,7 +54,7 @@
caption="Organisationseinheiten"
[path]="routes.ORGANISATIONSEINHEITEN"
>
- <ods-icon icon name="orga-unit" color="text" />
+ <ods-icon icon name="orga-unit" fill="text" />
</ods-nav-item>
<hr />
}
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 66408514bb..0931407fea 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -504,7 +504,7 @@
<ods-stamp-icon />
</ods-radio-button-card>
<ods-radio-button-card label="abgelehnt" name="exampleName" value="abgelehnt" variant="bescheid_abgelehnt">
- <ods-icon name="close" color="abgelehnt" size="large" />
+ <ods-icon name="close" fill="abgelehnt" size="large" />
</ods-radio-button-card>
</div>
</form>
@@ -557,19 +557,19 @@
<div class="flex flex-col gap-4 bg-background-200 p-6">
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="false" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument" subText="automatisch erstellen">
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>
</div>
@@ -580,26 +580,26 @@
text="Bescheiddokument und noch mehr"
subText="Subtext in der 2ten Reihe"
>
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument">
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>
</div>
<div class="mt-4">
<ods-file-upload-button class="w-72" [isLoading]="false" id="upload117" dataTestId="demo-upload-1">
- <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-upload" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
<p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
</div>
<div class="mt-4">
<ods-file-upload-button class="w-72" [isLoading]="true" id="upload117" dataTestId="demo-upload-2">
- <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-upload" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
<p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
index 12f62f2474..acf4e94784 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping-field-list-form/aggregation-mapping-field-form/aggregation-mapping-field-form.component.html
@@ -13,7 +13,7 @@
[dataTestId]="'remove-mapping-button-' + index"
[attr.data-test-id]="'remove-mapping-' + index"
>
- <ods-icon icon name="delete" color="error" />
+ <ods-icon icon name="delete" fill="error" />
</ods-button>
</div>
<div class="flex flex-col gap-4">
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
index fd66640a20..7fb1f503e3 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
@@ -39,7 +39,7 @@
data-test-id="delete-organisations-einheit-dialog-button"
[dialogData]="{ organisationsEinheitName: organisationsEinheit.name, organisationsEinheitId: organisationsEinheit.id }"
>
- <ods-icon icon name="delete" color="error" />
+ <ods-icon icon name="delete" fill="error" />
</ods-open-dialog-button>
</div>
</ods-list-item>
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
index a9f8785944..179f269b0d 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
+++ b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
@@ -1,3 +1,3 @@
<ods-open-dialog-button variant="outline_error" label="Löschen" dataTestId="delete-button">
- <ods-icon icon name="delete" color="error" />
+ <ods-icon icon name="delete" fill="error" />
</ods-open-dialog-button>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
index 649d125a51..33e0e261cd 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
@@ -37,7 +37,7 @@
(clickEmitter)="cancelWizard(bescheidStateResource.resource)"
dataTestId="close-bescheid"
>
- <ods-icon icon name="close" color="text" />
+ <ods-icon icon name="close" fill="text" />
</ods-button>
<alfa-bescheid-wizard
[vorgangWithEingangResource]="vorgangWithEingangResource"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
index 6c90dcd130..aa96d4bae0 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
@@ -41,7 +41,7 @@
data-test-id="button-abgelehnt"
variant="bescheid_abgelehnt"
>
- <ods-icon name="close" size="large" color="abgelehnt" />
+ <ods-icon name="close" size="large" fill="abgelehnt" />
</ods-radio-button-card>
</div>
<div class="flex">
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
index d566e92d9e..3ed2d41755 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
@@ -38,7 +38,7 @@
dataTestId="bescheiderstellung-abbrechen-entwurf-speichern"
text="Entwurf speichern"
>
- <ods-icon icon name="check" color="whitetext" />
+ <ods-icon icon name="check" fill="whitetext" />
</ods-button-with-spinner>
<ods-button-with-spinner
[stateResource]="deleteStateResource$ | async"
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
index f283d60473..8eba96e6b3 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/create-document-button-container/create-document-button/bescheid-wizard-create-document-button.component.html
@@ -6,5 +6,5 @@
subText="automatisch erstellen"
data-test-id="create-bescheid-document-button"
>
- <ods-icon icon name="bescheid-generate" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-generate" fill="pdf" size="extra-large" />
</ods-button-card>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
index 1633e3b160..1cecd65412 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
@@ -6,7 +6,7 @@
class="w-72"
data-test-id="bescheid-wizard-upload-document-upload-editor"
>
- <ods-icon icon name="bescheid-upload" color="pdf" size="extra-large" />
+ <ods-icon icon name="bescheid-upload" fill="pdf" size="extra-large" />
<ods-spinner-icon spinner size="extra-large" />
<div text class="text-center">Bescheiddokument hochladen</div>
</ods-single-file-upload-editor>
diff --git a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
index 03c6c749e0..cef4e8571a 100644
--- a/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
+++ b/alfa-client/libs/bescheid/src/lib/beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component.html
@@ -28,7 +28,7 @@
@if (bescheid.bewilligt) {
<ods-stamp-icon data-test-id="bewilligt-icon" size="small" class="fill-bewilligt" />
} @else {
- <ods-icon name="close" color="abgelehnt" data-test-id="abgelehnt-icon" />
+ <ods-icon name="close" fill="abgelehnt" data-test-id="abgelehnt-icon" />
}
{{ bescheid.beschiedenAm | formatFullDatePipe }}
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
index aed6ff10ce..49c0340b57 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
@@ -42,7 +42,7 @@
aria-label="Anhang löschen Button"
data-test-class="delete-file-button"
>
- <ods-icon name="close" color="text" />
+ <ods-icon name="close" fill="text" />
</button>
</div>
</ods-attachment>
diff --git a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
index c8151a459a..939f6bf256 100644
--- a/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
+++ b/alfa-client/libs/common/src/lib/accessibility-button/accessibility-button.component.ts
@@ -8,7 +8,7 @@ import { IconComponent } from '../../../../design-system/src/lib/icon/icon.compo
standalone: true,
imports: [CommonModule, LinkComponent, TooltipDirective, IconComponent],
template: `<ods-link [url]="url" [linkTestId]="linkTestId" tooltip="Barrierefreiheit" [openInNewTab]="true">
- <ods-icon name="accessibility" size="large" color="neutral" />
+ <ods-icon name="accessibility" size="large" fill="neutral" />
</ods-link>`,
})
export class AccessibilityButtonComponent {
diff --git a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
index 0b6ee4f204..85a4e7fe7c 100644
--- a/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
+++ b/alfa-client/libs/design-system/src/lib/bescheid-status-text/bescheid-status-text.component.ts
@@ -36,7 +36,7 @@ import { StampIconComponent } from '../icons/stamp-icon/stamp-icon.component';
><ods-stamp-icon size="medium" class="fill-bewilligt" />Bewilligt am {{ dateText }}</span
>
<span class="flex items-center gap-2" *ngIf="!bewilligt">
- <ods-icon name="close" color="abgelehnt" />
+ <ods-icon name="close" fill="abgelehnt" />
Abgelehnt am {{ dateText }}
</span>
<span *ngIf="hasBescheidDraft" class="flex items-center text-error" data-test-class="bescheid-status-draft">(Entwurf)</span>
diff --git a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
index ff29f8519d..0c9b6ef278 100644
--- a/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/back-button/back-button.component.html
@@ -25,6 +25,6 @@
-->
<a [routerLink]="linkTo" data-test-id="back-button" tabindex="-1">
<ods-button variant="ghost" size="fit" [tooltip]="label" tooltipAriaType="aria-labelledby">
- <ods-icon name="arrow-back" icon color="text" />
+ <ods-icon name="arrow-back" icon fill="text" />
</ods-button>
</a>
diff --git a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
index e116c9cf44..519af1f8ec 100644
--- a/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
+++ b/alfa-client/libs/user-profile/src/lib/assign-user-profile-button-container/assign-user-profile-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="showUserProfileSearch()"
>
- <ods-icon icon name="account-circle" color="text" />
+ <ods-icon icon name="account-circle" fill="text" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index 433acff379..66dcd512e7 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -35,7 +35,7 @@
size="fit"
(clickEmitter)="abschliessen()"
>
- <ods-icon icon name="check" color="text" />
+ <ods-icon icon name="check" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
index 1c8396c66a..b7252d4f0e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
@@ -34,7 +34,7 @@
size="fit"
dataTestId="annehmen-icon-button"
>
- <ods-icon icon name="check-circle" color="text" />
+ <ods-icon icon name="check-circle" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
diff --git a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
index 123e10b9d3..e46e98e4a7 100644
--- a/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
+++ b/alfa-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-archive-status/vorgang-archive-status.component.html
@@ -1,4 +1,4 @@
<div class="flex items-center gap-1">
- <ods-icon name="archive" color="text" />
+ <ods-icon name="archive" fill="text" />
<span>in Archivierung</span>
</div>
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
index c0be85781e..c249b2a2c2 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="erledigen()"
>
- <ods-icon icon name="check-circle" color="text" />
+ <ods-icon icon name="check-circle" fill="text" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
index be8296d701..a5600b7200 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/wiedereroeffnen-button-container/wiedereroeffnen-button-container.component.html
@@ -33,6 +33,6 @@
size="fit"
(clickEmitter)="wiedereroeffnen()"
>
- <ods-icon icon name="check-circle" color="text" />
+ <ods-icon icon name="check-circle" fill="text" />
</ods-button-with-spinner>
}
--
GitLab