From f263692c1e98276cb07bb87e248aa95206d6db64 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 22 Jan 2024 21:11:42 +0100
Subject: [PATCH] OZG-4527 OZG-4821 fix AZ-icon color, word-wrap and ellipsis
Aktenzeichen, opt dialog width
---
.../libs/ui/src/lib/ui/dialog/dialog.service.ts | 2 +-
.../aktenzeichen-edit-dialog.component.scss | 12 ++++++++----
.../aktenzeichen-editable.component.html | 2 +-
.../aktenzeichen-editable.component.scss | 3 +++
.../vorgang-detail-header.component.html | 2 +-
.../vorgang-detail-header.component.scss | 6 +++++-
6 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/alfa-client/libs/ui/src/lib/ui/dialog/dialog.service.ts b/alfa-client/libs/ui/src/lib/ui/dialog/dialog.service.ts
index cb43040020..42be04313b 100644
--- a/alfa-client/libs/ui/src/lib/ui/dialog/dialog.service.ts
+++ b/alfa-client/libs/ui/src/lib/ui/dialog/dialog.service.ts
@@ -59,7 +59,7 @@ export class DialogService {
};
readonly WIDE_DIALOG_CONFIG: MatDialogConfig = {
- width: '40%',
+ width: '610px',
restoreFocus: false,
};
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss
index 7be478486c..3b176140eb 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.scss
@@ -16,17 +16,19 @@
display: grid;
grid-template-columns: min-content auto min-content;
grid-column-gap: 0.5rem;
+ grid-row-gap: 0.25rem;
align-items: center;
grid-template-areas:
- "az_icon az_text paste_icon"
- ". hinweis .";
+ 'az_icon az_text paste_icon'
+ '. hinweis .';
}
.az_icon {
grid-area: az_icon;
+ color: #c2c2c2;
&--active {
- fill: black;
+ color: black;
}
}
@@ -40,6 +42,8 @@
.hinweis {
grid-area: hinweis;
+ padding-left: 16px;
+ font-size: 14px;
}
ozgcloud-stroked-button-with-spinner {
@@ -55,4 +59,4 @@ mat-icon {
mat-dialog-content {
padding-top: 0.5rem !important;
-}
\ No newline at end of file
+}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
index abe973ec24..c80c680a29 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-editable/aktenzeichen-editable.component.html
@@ -24,7 +24,7 @@
-->
<div class="horizontal">
- <h1 alfa-aktenzeichen class="ellipsis" [vorgang]="vorgang" data-test-id="aktenzeichen"></h1>
+ <h1 alfa-aktenzeichen [vorgang]="vorgang" data-test-id="aktenzeichen"></h1>
<ng-container *ngIf="vorgang | hasLink: linkRel.SET_AKTENZEICHEN">
<ozgcloud-icon-button-primary svgIcon="edit" tooltip="Aktenzeichen bearbeiten" (clickEmitter)="onEdit()"></ozgcloud-icon-button-primary>
</ng-container>
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 3fe577f7a2..4471409a63 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
@@ -32,4 +32,7 @@ h1 {
line-height: 1.4;
font-size: 1.5rem;
font-weight: 400;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow:ellipsis;
}
\ No newline at end of file
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html
index 9556a0dba2..1613b7e5be 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.html
@@ -32,7 +32,7 @@
<div class="aktenzeichen">
<mat-icon svgIcon="az"></mat-icon>
- <alfa-aktenzeichen-editable [vorgang]="vorgangWithEingang"></alfa-aktenzeichen-editable>
+ <alfa-aktenzeichen-editable class="aktenzeichen-editable" [vorgang]="vorgangWithEingang"></alfa-aktenzeichen-editable>
</div>
<alfa-vorgang-nummer class="vorgang-nummer big" [vorgang]="vorgangWithEingang"></alfa-vorgang-nummer>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.scss b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.scss
index 5fd548620e..42aebc3982 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.scss
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component.scss
@@ -62,7 +62,7 @@
". aktenzeichen aktenzeichen vorgang-nummer user";
.aktenzeichen, .vorgang-nummer, .user {
- align-self: start;
+ align-self: center;
}
}
@@ -116,6 +116,10 @@ mat-icon {
margin-left: -2px;
display: flex;
align-items: center;
+
+ .aktenzeichen-editable {
+ width: calc(100% - 48px);
+ }
}
.vorgang-nummer {
--
GitLab