From 2cd56971974772a3c34e21370588bc8c7ec8f07c Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Mon, 10 Feb 2025 12:49:07 +0100
Subject: [PATCH] OZG-7474 7697 buttons verschieben
---
.../abschliessen-button/abschliessen-button.component.html | 4 ++--
.../bearbeiten-button/bearbeiten-button.component.html | 4 ++--
.../bescheiden-button/bescheiden-button.component.html | 4 ++--
.../vorgang-detail-area/vorgang-detail-area.component.html | 7 ++++---
.../vorgang-detail-formular-buttons.component.ts | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
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 f9670cbee8..8b4f93ab84 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
@@ -41,10 +41,10 @@
[stateResource]="commandStateResource$ | async"
data-test-id="abschliessen-button"
text="Abschließen"
- variant="outline"
+ variant="primary"
(clickEmitter)="abschliessen()"
>
- <ods-check-icon icon />
+ <ods-check-icon icon class="fill-white" />
</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 d1de12ab8c..a380dac9d3 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
@@ -41,10 +41,10 @@
[stateResource]="commandStateResource$ | async"
data-test-id="bearbeiten-button"
text="Bearbeiten"
- variant="outline"
+ variant="primary"
(clickEmitter)="bearbeiten()"
>
- <ods-edit-icon icon />
+ <ods-edit-icon icon class="fill-white"/>
</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 da120283e6..f98bc5bc4b 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
@@ -40,10 +40,10 @@
[stateResource]="commandStateResource$ | async"
(clickEmitter)="bescheiden()"
[text]="buttonText"
- variant="outline"
+ variant="primary"
data-test-id="bescheiden-button"
>
- <ods-stamp-icon icon class="fill-primary" size="medium" />
+ <ods-stamp-icon icon class="fill-white" size="medium" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
index bc73d5f4c8..772fdbd059 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
@@ -35,8 +35,11 @@
data-test-id="vorgang-detail-header"
></alfa-vorgang-detail-header>
+
<div class="section one-column">
- <alfa-vorgang-detail-formular-daten [vorgangWithEingang]="vorgangResource"></alfa-vorgang-detail-formular-daten>
+ <alfa-vorgang-detail-formular-buttons [vorgangWithEingang]="vorgangResource" />
+
+ <alfa-vorgang-detail-formular-daten [vorgangWithEingang]="vorgangResource" />
<div *ngIf="vorgangResource | hasLink: vorgangWithEingangLinkRel.BESCHEIDE">
<ozgcloud-expansion-panel headline="Bescheid" data-test-id="bescheid-expansion-panel">
@@ -44,8 +47,6 @@
</alfa-bescheid-list-in-vorgang-container>
</ozgcloud-expansion-panel>
</div>
-
- <alfa-vorgang-detail-formular-buttons [vorgangWithEingang]="vorgangResource"></alfa-vorgang-detail-formular-buttons>
</div>
<div class="section one-column" *ngIf="vorgangResource | hasLink: vorgangWithEingangLinkRel.COLLABORATIONS">
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 908b73de5e..a38e9190c0 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-12 flex gap-4}'],
+ styles: [':host {@apply ml-14 flex gap-4 mb-6}'],
})
export class VorgangDetailFormularButtonsComponent {
@Input() vorgangWithEingang: VorgangWithEingangResource;
--
GitLab