Skip to content
Snippets Groups Projects
Commit 90a02d29 authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'OZG-7292-Barrierefreiheit-Vorgangsliste' (#853) from...

Merge pull request 'OZG-7292-Barrierefreiheit-Vorgangsliste' (#853) from OZG-7292-Barrierefreiheit-Vorgangsliste into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/853


Reviewed-by: default avatarOZGCloud <ozgcloud@mgm-tp.com>
Reviewed-by: default avatarOZGCloud <ozgcloud@mgm-tp.com>
parents 77afd5b4 68888d2f
Branches
Tags
No related merge requests found
Showing
with 78 additions and 100 deletions
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<ozgcloud-spinner [stateResource]="apiRoot"> <ozgcloud-spinner [stateResource]="apiRoot">
<alfa-header-container [apiRootStateResource]="apiRoot"></alfa-header-container> <alfa-header-container [apiRootStateResource]="apiRoot"></alfa-header-container>
<div class="relative ml-4 mt-16 flex flex-grow items-start justify-between"> <div class="relative ml-4 flex flex-grow items-start justify-between sm:mt-16">
<div class="mat-app-background relative grow"><router-outlet></router-outlet></div> <div class="mat-app-background relative grow"><router-outlet></router-outlet></div>
<section class="mat-app-background right-nav"> <section class="mat-app-background right-nav">
......
...@@ -30,7 +30,7 @@ import { CheckIconComponent } from '../../icons/check-icon/check-icon.component' ...@@ -30,7 +30,7 @@ import { CheckIconComponent } from '../../icons/check-icon/check-icon.component'
standalone: true, standalone: true,
imports: [CommonModule, CheckIconComponent], imports: [CommonModule, CheckIconComponent],
template: `<button template: `<button
class="flex cursor-pointer items-center gap-1 px-3 py-1.5 outline-none hover:bg-neutral-300 focus-visible:bg-neutral-300 dark:hover:bg-neutral-600 dark:focus-visible:bg-neutral-600" class="flex h-full cursor-pointer items-center gap-1 px-3 py-1.5 outline-none hover:bg-neutral-300 focus-visible:bg-neutral-300 dark:hover:bg-neutral-600 dark:focus-visible:bg-neutral-600"
[ngClass]="{ [ngClass]="{
'bg-neutral-200 font-bold hover:bg-neutral-200 focus-visible:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800 dark:focus-visible:bg-neutral-800': 'bg-neutral-200 font-bold hover:bg-neutral-200 focus-visible:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800 dark:focus-visible:bg-neutral-800':
isChecked, isChecked,
......
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
--> -->
<header data-test-id="header"> <header data-test-id="header">
<div class="left"> <div class="flex self-center sm:ml-3 lg:min-w-60">
<alfa-header-logo></alfa-header-logo> <alfa-header-logo></alfa-header-logo>
</div> </div>
<div class="middle"> <div class="grow sm:order-2 sm:mr-4 lg:w-full">
<alfa-vorgang-search-container></alfa-vorgang-search-container> <alfa-vorgang-search-container></alfa-vorgang-search-container>
</div> </div>
<div class="flex items-center text-ozggray-800 dark:text-ozggray-300"> <div class="flex flex-1 items-center justify-end self-end text-ozggray-800 dark:text-ozggray-300 sm:order-3 sm:self-center">
<common-accessibility-button <common-accessibility-button
*ngIf="apiRootStateResource?.resource.barrierefreiheitUrl" *ngIf="apiRootStateResource?.resource.barrierefreiheitUrl"
[url]="apiRootStateResource.resource.barrierefreiheitUrl" [url]="apiRootStateResource.resource.barrierefreiheitUrl"
......
...@@ -26,30 +26,13 @@ ...@@ -26,30 +26,13 @@
@import 'variables'; @import 'variables';
header { header {
height: $header-height; @apply flex flex-row flex-wrap content-between items-center gap-2 pb-2 pl-4 pr-4 pt-2 sm:fixed sm:flex-nowrap sm:content-between sm:gap-0 sm:pr-8;
min-height: $header-height;
box-shadow: $shadow-bottom; box-shadow: $shadow-bottom;
padding: 0.5rem 2rem 0.5rem 1rem;
left: 0; left: 0;
top: 0; top: 0;
right: 0; right: 0;
width: 100%; width: 100%;
z-index: 3; z-index: 3;
display: flex;
align-items: center;
justify-content: space-between;
position: fixed;
}
.middle {
flex-grow: 1;
margin-right: 1rem;
}
.left {
display: flex;
align-items: inherit;
margin-left: 0.75rem;
@include media('>desktop') {
min-width: 240px;
}
} }
...@@ -27,22 +27,20 @@ ...@@ -27,22 +27,20 @@
[attr.aria-label]="ariaLabel" [attr.aria-label]="ariaLabel"
routerLink="/vorgang/{{ vorgang | toResourceUri: vorgangLinkRel.VORGANG_WITH_EINGANG }}" routerLink="/vorgang/{{ vorgang | toResourceUri: vorgangLinkRel.VORGANG_WITH_EINGANG }}"
[attr.data-test-id]="'vorgang-list-item-' + vorgang.name | convertForDataTest" [attr.data-test-id]="'vorgang-list-item-' + vorgang.name | convertForDataTest"
class="flex flex-row gap-4 border-b-2 border-gray-200 p-4 hover:shadow-[inset_1px_-1px_0_0_rgba(0,0,0,0.16)] dark:border-b dark:border-gray-300 dark:hover:shadow-[inset_1px_-1px_0_0_rgba(255,255,255,0.60)]" class="flex flex-col gap-2 border-b-2 border-gray-200 p-4 hover:shadow-[inset_1px_-1px_0_0_rgba(0,0,0,0.16)] dark:border-b dark:border-gray-300 dark:hover:shadow-[inset_1px_-1px_0_0_rgba(255,255,255,0.60)] lg:flex-row lg:gap-4"
> >
<div class="flex w-32 flex-none flex-col"> <div class="flex grow flex-row gap-4">
<div class="flex flex-1 flex-col gap-4 lg:flex-row">
<div class="flex flex-none flex-row lg:w-32 lg:flex-col">
<div class="flex items-center gap-3"> <div class="flex items-center gap-3">
<alfa-vorgang-status-dot <alfa-vorgang-status-dot [status]="vorgang.status" diameter="12" data-test-class="status-dot"></alfa-vorgang-status-dot>
[status]="vorgang.status"
diameter="12"
data-test-class="status-dot"
></alfa-vorgang-status-dot>
<alfa-vorgang-status-text <alfa-vorgang-status-text
[status]="vorgang.status" [status]="vorgang.status"
data-test-class="status-text" data-test-class="status-text"
class="status-text" class="status-text"
></alfa-vorgang-status-text> ></alfa-vorgang-status-text>
</div> </div>
<div class="ml-6 mt-3 flex text-sm"> <div class="ml-6 flex text-sm lg:mt-3">
<alfa-vorgang-bescheid-status <alfa-vorgang-bescheid-status
*ngIf="vorgang.antragBewilligt !== null" *ngIf="vorgang.antragBewilligt !== null"
[vorgang]="vorgang" [vorgang]="vorgang"
...@@ -50,7 +48,7 @@ ...@@ -50,7 +48,7 @@
></alfa-vorgang-bescheid-status> ></alfa-vorgang-bescheid-status>
</div> </div>
</div> </div>
<div class="flex flex-1 flex-col gap-1"> <div class="ml-6 flex flex-1 flex-col gap-1 lg:ml-0">
<div data-test-id="name" class="break-all text-base font-medium"> <div data-test-id="name" class="break-all text-base font-medium">
{{ vorgang.name }} {{ vorgang.name }}
</div> </div>
...@@ -66,6 +64,7 @@ ...@@ -66,6 +64,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ml-6 flex w-48 gap-4 lg:ml-0">
<div class="flex w-36 flex-none flex-col gap-2"> <div class="flex w-36 flex-none flex-col gap-2">
<div> <div>
<alfa-vorgang-created-at class="eingang" [vorgang]="vorgang"></alfa-vorgang-created-at> <alfa-vorgang-created-at class="eingang" [vorgang]="vorgang"></alfa-vorgang-created-at>
...@@ -88,7 +87,9 @@ ...@@ -88,7 +87,9 @@
</ozgcloud-postfach-icon> </ozgcloud-postfach-icon>
</div> </div>
</div> </div>
<div class="w-10 flex-none"> </div>
</div>
<div class="flex-none">
<alfa-user-profile-in-vorgang-list-item-container <alfa-user-profile-in-vorgang-list-item-container
*ngIf="vorgang | hasLink: vorgangLinkRel.ASSIGN" *ngIf="vorgang | hasLink: vorgangLinkRel.ASSIGN"
data-test-id="vorgang-user-icon" data-test-id="vorgang-user-icon"
...@@ -96,4 +97,5 @@ ...@@ -96,4 +97,5 @@
class="user-icon" class="user-icon"
></alfa-user-profile-in-vorgang-list-item-container> ></alfa-user-profile-in-vorgang-list-item-container>
</div> </div>
</div>
</a> </a>
...@@ -24,13 +24,10 @@ ...@@ -24,13 +24,10 @@
@import 'variables'; @import 'variables';
:host { :host {
position: sticky; @apply flex items-center justify-end sm:sticky;
top: $header-height; top: $header-height;
height: 3rem; min-height: 3rem;
width: 100%; width: 100%;
z-index: 2; z-index: 2;
display: flex;
justify-content: flex-end;
align-items: center;
padding: 0.25rem 0 0.25rem 1rem; padding: 0.25rem 0 0.25rem 1rem;
} }
...@@ -26,18 +26,15 @@ ...@@ -26,18 +26,15 @@
<h1 class="sr-only">Vorgangsliste</h1> <h1 class="sr-only">Vorgangsliste</h1>
<alfa-vorgang-filter-menu-container class="mat-app-background"></alfa-vorgang-filter-menu-container> <alfa-vorgang-filter-menu-container class="mat-app-background"></alfa-vorgang-filter-menu-container>
<div class="flex flex-row"> <div class="flex flex-col sm:flex-row">
<alfa-vorgang-views-menu-container <alfa-vorgang-views-menu-container
*ngIf="apiRootStateResource.resource" *ngIf="apiRootStateResource.resource"
[apiRootResource]="apiRootStateResource.resource" [apiRootResource]="apiRootStateResource.resource"
class="w-[15.5rem] flex-none" class="w-full sm:w-[15.5rem] sm:flex-none"
></alfa-vorgang-views-menu-container> ></alfa-vorgang-views-menu-container>
<main <main
*ngIf=" *ngIf="apiRootStateResource?.resource | hasLink: apiRootLinkRel.ALLE_VORGAENGE; else showNoRoleMessage"
apiRootStateResource?.resource | hasLink: apiRootLinkRel.ALLE_VORGAENGE;
else showNoRoleMessage
"
data-test-id="vorgaenge-list" data-test-id="vorgaenge-list"
class="flex flex-1 flex-col overflow-hidden border border-gray-200 dark:border-black" class="flex flex-1 flex-col overflow-hidden border border-gray-200 dark:border-black"
> >
......
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
@import 'variables'; @import 'variables';
:host { :host {
@apply self-start md:sticky;
background-color: $background; background-color: $background;
padding: 0 1rem 0 0; padding: 0 1rem 0 0;
position: sticky;
align-self: flex-start;
top: $header-height + $navigation-height; top: $header-height + $navigation-height;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment