From 3e878c34e943d135874125186789d1f7f441301a Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 23 Jan 2024 16:27:43 +0100 Subject: [PATCH] OZG-4706 OZG-4758 Refactor layout --- .../ozgcloud-button-content.component.html | 2 ++ .../ozgcloud-button-content.component.scss | 2 +- .../aktenzeichen-editable.component.scss | 6 ++++++ .../vorgang-in-postfach-breadcrumb.component.html | 4 ++-- .../vorgang-in-postfach-breadcrumb.component.scss | 8 -------- .../wiedervorlage-breadcrumb.component.html | 2 +- .../wiedervorlage-breadcrumb.component.scss | 8 -------- 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html b/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html index ac82f2c90b..fd800b47fd 100644 --- a/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html +++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.html @@ -1,9 +1,11 @@ <mat-icon *ngIf="icon" data-test-class="icon" + [class.with-text]="text" [style.visibility]="isDisabled ? 'hidden' : 'visible'"> {{ icon }} </mat-icon> <mat-icon *ngIf="svgIcon" data-test-class="icon" + [class.with-text]="text" [svgIcon]="svgIcon" [style.visibility]="isDisabled ? 'hidden' : 'visible'"> </mat-icon> diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss b/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss index d1670e97df..99053feec5 100644 --- a/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss +++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-button/shared/ozgcloud-button-content/ozgcloud-button-content.component.scss @@ -6,7 +6,7 @@ $rightMargin: 8px; justify-content: center; } -mat-icon { +mat-icon.with-text { margin-right: $rightMargin; } diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss index ca436cc9bc..0fe9a65ebb 100644 --- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss +++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.scss @@ -28,3 +28,9 @@ font-size: 16px; font-weight: 400; } + +// Workaround Material's fixed 48px height +:host ::ng-deep ozgcloud-icon-button-primary button { + position: absolute; + top: -24px; +} \ No newline at end of file diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.html b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.html index fc537d604e..76fbd0fcda 100644 --- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.html +++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.html @@ -23,8 +23,8 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<h1 *ngIf="vorgangStateResource.resource as vorgang"> +<span *ngIf="vorgangStateResource.resource as vorgang"> <a routerLink='/vorgang/{{ vorgang | toResourceUri }}' alfa-aktenzeichen [vorgang]="vorgang"></a> <span>/</span> <span>Nachrichten</span> -</h1> \ No newline at end of file +</span> \ No newline at end of file diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.scss b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.scss index fc20de9113..e464165e3c 100644 --- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.scss +++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb/vorgang-in-postfach-breadcrumb.component.scss @@ -43,12 +43,4 @@ background-color: rgba(#777, 0.16); } } - - h1 { - font-size: inherit; - font-weight: inherit; - display: inline-block; - margin: 0 4px; - padding: 0; - } } diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.html b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.html index e5c5cf7e66..c9ba196723 100644 --- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.html +++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.html @@ -27,4 +27,4 @@ <span>/</span> <span>Wiedervorlagen</span> <span>/</span> -<h1>{{ betreff }}</h1> +<span>{{ betreff }}</span> diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.scss b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.scss index 45b498dd7d..799ca15469 100644 --- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.scss +++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-breadcrumb-container/wiedervorlage-breadcrumb/wiedervorlage-breadcrumb.component.scss @@ -43,12 +43,4 @@ background-color: rgba(#777, 0.16); } } - - h1 { - font-size: inherit; - font-weight: inherit; - display: inline-block; - margin: 0 4px; - padding: 0; - } } \ No newline at end of file -- GitLab