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 55c594db25f785c1c31d124327d071336742c85d..d63d7046e6e03287fae28cd1e019ff1fe55ce0f6 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 @@ -27,7 +27,7 @@ <div class="fixed inset-0 z-10 w-screen overflow-y-auto"> <div class="flex h-full items-center justify-center p-8"> <div - class="relative h-full w-full max-w-7xl transform overflow-hidden rounded-lg bg-background-200 px-6 py-10 text-left shadow-xl transition-all" + class="relative h-full w-full max-w-7xl transform overflow-hidden rounded-lg bg-background-200 py-9 pl-6 pr-9 text-left shadow-xl transition-all" > @let bescheidStateResource = bescheidDraftStateResource$ | async; <ods-button @@ -37,7 +37,7 @@ (clickEmitter)="cancelWizard(bescheidStateResource.resource)" dataTestId="close-bescheid" > - <ods-close-icon icon/> + <ods-close-icon icon /> </ods-button> <alfa-bescheid-wizard [vorgangWithEingangResource]="vorgangWithEingangResource" diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts index 00674092b080e9bc4c056c66be46a634e4171b3d..c6622e64f1f3ee3dce37cef72ed5371892a7893c 100644 --- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts +++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts @@ -27,12 +27,19 @@ import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; import { DialogRef } from '@angular/cdk/dialog'; import { Component, EventEmitter, inject, Input, Output, ViewContainerRef } from '@angular/core'; import { filter } from 'rxjs'; -import { isDialogSuccessfullyCompleted, OzgcloudDialogCommandResult, } from '../../../../../../../ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result'; -import { AbschliessenDialogData, BescheidWizardAbschliessenDialogContainerComponent, } from '../abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component'; +import { + isDialogSuccessfullyCompleted, + OzgcloudDialogCommandResult, +} from '../../../../../../../ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result'; +import { + AbschliessenDialogData, + BescheidWizardAbschliessenDialogContainerComponent, +} from '../abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component'; @Component({ selector: 'alfa-bescheid-wizard-abschliessen-button', templateUrl: './bescheid-wizard-abschliessen-button.component.html', + styles: [':host {@apply flex-1 flex items-end}'], }) export class BescheidWizardAbschliessenButtonComponent { @Input() vorgangWithEingangResource: VorgangWithEingangResource; 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 ae309b10639b4f1815612c134262704486566d83..db9307187ec8c100d91ff2c2ffc7b99dd22fc5e2 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 @@ -1,6 +1,6 @@ @if (bescheidResource | hasLink: BescheidLinkRel.CREATE_DOCUMENT) { <ods-button-card - class="w-72" + class="w-full max-w-72" [isLoading]="bescheidDocument.create.loading" (click)="clickEmitter.emit()" text="Bescheiddokument" diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/form/bescheid-wizard-dokumente-hochladen-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/form/bescheid-wizard-dokumente-hochladen-form.component.html index 516004924d7c7acf0911bcce04ffd154e06114b0..fd2a2ab6c43b6e00ba06a0347278e2ab53b0c5aa 100644 --- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/form/bescheid-wizard-dokumente-hochladen-form.component.html +++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen-container/form/bescheid-wizard-dokumente-hochladen-form.component.html @@ -23,7 +23,7 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<div class="flex flex-col gap-4"> +<div class="mt-4 flex flex-col gap-4"> <alfa-bescheid-wizard-create-document-button-container [bescheidResource]="bescheidResource" data-test-id="create-document-button" 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 2f79362b024623efe8def6224fbb32534de4d5e3..0b04ceb6fc50d6d98b70f95f7f252c6a62a11252 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 @@ -1,4 +1,4 @@ -<div [formGroup]="formService.form"> +<div [formGroup]="formService.form" class="w-full"> <ods-single-file-upload-editor *ngIf="bescheidResource | hasLink: bescheidLinkRel.UPLOAD_BESCHEID_FILE" [uploadInProgress]="upload.loading" 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.ts 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.ts index e21906aac5cfa1f8d0522fd45ce62cdfd632f792..d48f7dbde8774df3bf2599415e84da79a123d49d 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.ts +++ 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.ts @@ -11,6 +11,7 @@ import { BescheidFormService } from '../../../bescheid.formservice'; @Component({ selector: 'alfa-bescheid-wizard-upload-document-button', templateUrl: './bescheid-wizard-upload-document-button.component.html', + styles: [':host {@apply flex grow}'], }) export class BescheidWizardUploadDocumentButtonComponent { @Input() bescheidResource: BescheidResource; diff --git a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html index 4a9fe0c97298f30da5307f19c7ca79cbeca42f73..ff08ce18e4ad8cc6037b84833bd941f375a6da0f 100644 --- a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html +++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html @@ -34,7 +34,7 @@ [accept]="accept" [attr.data-test-id]="(label | convertForDataTest) + '-file-upload-button'" [isLoading]="uploadInProgress.loading" - class="relative w-72" + class="relative w-full max-w-72" > <ods-spinner-icon spinner size="medium" /> <ods-attachment-icon icon size="medium" /> diff --git a/alfa-client/libs/design-component/src/lib/form/single-file-upload-editor/single-file-upload-editor.component.html b/alfa-client/libs/design-component/src/lib/form/single-file-upload-editor/single-file-upload-editor.component.html index ab4172edc10957129320faf3a6533cfe9d1c77ce..837b069ad149e2e7e2eb08305e54e8ab74df16f5 100644 --- a/alfa-client/libs/design-component/src/lib/form/single-file-upload-editor/single-file-upload-editor.component.html +++ b/alfa-client/libs/design-component/src/lib/form/single-file-upload-editor/single-file-upload-editor.component.html @@ -24,7 +24,7 @@ --> <ods-file-upload-button - class="w-72" + class="w-full max-w-72" [id]="uploadFileId" [isLoading]="uploadInProgress" [accept]="accept"