From b7e843e6cb042e4940b5aa9dd8f64033ffdded44 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <kontakt@webkreation.de>
Date: Mon, 10 Feb 2025 14:52:02 +0100
Subject: [PATCH] OZG-7474 button layouts
---
.../libs/design-system/src/lib/button/button.component.ts | 2 +-
.../abschliessen-button/abschliessen-button.component.html | 2 +-
.../buttons/bearbeiten-button/bearbeiten-button.component.html | 2 +-
.../buttons/bescheiden-button/bescheiden-button.component.html | 2 +-
.../vorgang-detail-formular-buttons.component.ts | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.ts b/alfa-client/libs/design-system/src/lib/button/button.component.ts
index 3db69acbf3..7276be54ba 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.ts
@@ -36,7 +36,7 @@ export const buttonVariants = cva(
{
variants: {
variant: {
- primary: 'bg-primary text-white shadow-md hover:enabled:bg-primary-hover',
+ primary: 'bg-primary text-whitetext shadow-md hover:enabled:bg-primary-hover',
outline:
'border border-primary bg-background-50 text-primary shadow-md hover:enabled:bg-ghost-hover focus-visible:border-background-200',
ghost:
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 8b4f93ab84..e4c61562d9 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
@@ -44,7 +44,7 @@
variant="primary"
(clickEmitter)="abschliessen()"
>
- <ods-check-icon icon class="fill-white" />
+ <ods-check-icon icon class="fill-whitetext" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
index a380dac9d3..ab4a765f1e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
@@ -44,7 +44,7 @@
variant="primary"
(clickEmitter)="bearbeiten()"
>
- <ods-edit-icon icon class="fill-white"/>
+ <ods-edit-icon icon class="fill-whitetext" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
index f98bc5bc4b..e44c2aefa5 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
@@ -43,7 +43,7 @@
variant="primary"
data-test-id="bescheiden-button"
>
- <ods-stamp-icon icon class="fill-white" size="medium" />
+ <ods-stamp-icon icon class="fill-whitetext" size="medium" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.ts
index a38e9190c0..462a97addb 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.ts
@@ -27,7 +27,7 @@ import { Component, Input } from '@angular/core';
@Component({
selector: 'alfa-vorgang-detail-formular-buttons',
templateUrl: './vorgang-detail-formular-buttons.component.html',
- styles: [':host {@apply ml-14 flex gap-4 mb-6}'],
+ styles: [':host {@apply mt-4 mb-6 ml-14 flex gap-4}'],
})
export class VorgangDetailFormularButtonsComponent {
@Input() vorgangWithEingang: VorgangWithEingangResource;
--
GitLab