diff --git a/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.scss b/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.scss index b61513b8658403b0df5a1a098b21f7a37304aac9..03209bebef753f062bb961da45cb2194e949bbd8 100644 --- a/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.scss +++ b/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-button-container/user-profile-button-container.component.scss @@ -25,7 +25,7 @@ border: 0; background-color: transparent; margin: 0; - padding: 0 0 8px 0; + padding: 0; display: block; outline: 0; cursor: pointer; 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 abe973ec243bfea62ba413c267115d5d64d88a88..1d078b33608b5decfc4b631d2db21be15734737c 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> + <div alfa-aktenzeichen class="ellipsis" [vorgang]="vorgang" data-test-id="aktenzeichen"></div> <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 3fe577f7a2a70148f5f5a061f8facb65ba268443..ca436cc9bc6222e98f33293c5de15b8c3611f37b 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 @@ -25,11 +25,6 @@ .horizontal { display: flex; align-items: center; -} - -h1 { - margin: 0; - line-height: 1.4; - font-size: 1.5rem; + font-size: 16px; font-weight: 400; -} \ 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 dc7ff610b16e07c12d5e8b747008490dc7119053..55a0e311dd4ae73713d1761b99fd681ba00c600e 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 @@ -37,7 +37,7 @@ <alfa-aktenzeichen-editable [vorgang]="vorgangWithEingang"></alfa-aktenzeichen-editable> </div> -<h2 data-test-id="name" class="name">{{ vorgangWithEingang.name }}</h2> +<div data-test-id="name" class="name">{{ vorgangWithEingang.name }}</div> <alfa-user-profile-in-vorgang-container *ngIf="vorgangWithEingang | hasLink: linkRel.ASSIGN" data-test-id="vorgang-header-user-icon" [vorgang]="vorgangWithEingang" 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 96f337f3a6eb71b6a7b7706041b34573eb40c324..28d7123c4fbb16a1d544a101c09b87d0519f036c 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 @@ -30,57 +30,21 @@ row-gap: 0.5rem; min-width: 22rem; align-items: center; - grid-template-columns: 8% 80% 12%; + grid-template-columns: 8% 84% 8%; grid-template-areas: "status-dot status-text initial-date" - ". vorgang-nummer vorgang-nummer" - ". aktenzeichen aktenzeichen" - ". name user"; - - @include media('>desktop') { - grid-template-columns: 5% 20% 52% 23%; - grid-template-areas: - "status-dot status-text name initial-date" - ". vorgang-nummer vorgang-nummer vorgang-nummer" - ". aktenzeichen aktenzeichen user"; - - .name { - margin-right: 5rem; - } - .user { - margin-top: -0.25rem; - } - .vorgang-nummer { - align-self: start; - } - } - - @include media('>xxlDesktop') { - grid-template-columns: 4% 13% 34% 34% 15%; - grid-template-areas: - "status-dot status-text name name initial-date" - ". vorgang-nummer vorgang-nummer aktenzeichen user"; - - .aktenzeichen, .vorgang-nummer, .user { - align-self: start; - } - } + ". name user" + ". vorgang-nummer user" + ". aktenzeichen aktenzeichen"; padding: 1rem 1.5rem; } -h1 { - margin: 0; - line-height: 1.4; - font-size: 1.5rem; - font-weight: 400; -} - -h2 { +.name { line-height: 1.4; margin: 0; - font-size: 1rem; - font-weight: 400; + font-size: 16px; + font-weight: 500; } .ellipsis { @@ -132,5 +96,4 @@ mat-icon { grid-area: user; align-self: start; justify-self: end; - margin-top: -1.5rem; } diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/_vorgang-nummer.component.theme.scss b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/_vorgang-nummer.component.theme.scss index 651503abe17fffaa0e5422e634d324c0a0536ea8..df86020467978950e4c99f6640f1fcd410a02cf5 100644 --- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/_vorgang-nummer.component.theme.scss +++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-nummer/_vorgang-nummer.component.theme.scss @@ -44,8 +44,7 @@ alfa-vorgang-nummer { &.big { div { - line-height: 1.4; - font-size: 1.5rem; + font-size: 16px; font-weight: 400; } mat-icon {