From b37e270373d76ecb63dbe3644b01464c7012c343 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 16 Aug 2024 18:24:14 +0200
Subject: [PATCH] OZG-6305 OZG-6463 apply styling
---
.../collaboration-request-form.component.html | 4 ++--
.../organisations-einheit-container.component.html | 12 +++++++-----
.../organisations-einheit-container.component.ts | 8 +++++++-
.../organisations-einheit.component.html | 2 +-
.../collaboration/src/lib/collaboration.module.ts | 2 +-
.../search-organisations-einheit-form.component.ts | 2 +-
alfa-client/libs/design-system/src/index.ts | 2 ++
.../src/lib/tailwind-preset/tailwind.config.js | 6 ++++++
8 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html
index f15efcdd56..d2cb5eb2d4 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component.html
@@ -2,7 +2,7 @@
[fieldControl]="formService.form.controls.organisationseinheit"
></alfa-organisations-einheit-container>
-<form [formGroup]="formService.form" class="flex flex-col gap-2">
+<form [formGroup]="formService.form" class="mt-4 flex flex-col gap-2">
<ods-text-editor
label="Titel"
[formControlName]="formServiceClass.FIELD_TITLE"
@@ -15,7 +15,7 @@
></ods-textarea-editor>
</form>
-<div class="flex items-center gap-6">
+<div class="mt-4 flex items-center gap-6">
<ods-button
text="Zuarbeit anfragen"
dataTestId="collaboration-request-send-button"
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html
index 5b9d6a0bf0..66d554560d 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.html
@@ -1,9 +1,11 @@
-<ods-search-icon />
<ng-container *ngIf="organisationsEinheitResource; else searchButton">
- <alfa-organisations-einheit
- data-test-id="organisations-einheit-in-collaboration"
- [organisationsEinheitResource]="organisationsEinheitResource"
- ></alfa-organisations-einheit>
+ <div class="flex items-center gap-3">
+ <ods-search-icon class="flex-none" />
+ <alfa-organisations-einheit
+ data-test-id="organisations-einheit-in-collaboration"
+ [organisationsEinheitResource]="organisationsEinheitResource"
+ ></alfa-organisations-einheit>
+ </div>
</ng-container>
<ng-template #searchButton>
<div class="flex items-center gap-3">
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.ts
index 0fadb4dff5..872efeefb5 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component.ts
@@ -3,13 +3,17 @@ import {
OrganisationsEinheitService,
} from '@alfa-client/collaboration-shared';
import { OzgcloudDialogService } from '@alfa-client/ui';
-import { DialogRef } from '@angular/cdk/dialog';
+import { DialogConfig, DialogRef } from '@angular/cdk/dialog';
import { Component, Input, ViewContainerRef } from '@angular/core';
import { FormControl } from '@angular/forms';
import { ResourceUri, getUrl } from '@ngxp/rest';
import { first } from 'rxjs';
import { SearchOrganisationsEinheitContainerComponent } from '../../../search-organisations-einheit-container/search-organisations-einheit-container.component';
+const DIALOG_CONFIG: DialogConfig = {
+ backdropClass: ['backdrop-blur-1', 'bg-greybackdrop'],
+};
+
@Component({
selector: 'alfa-organisations-einheit-container',
templateUrl: './organisations-einheit-container.component.html',
@@ -32,6 +36,8 @@ export class OrganisationsEinheitContainerComponent {
this.dialogService.openInCallingComponentContext<SearchOrganisationsEinheitContainerComponent>(
SearchOrganisationsEinheitContainerComponent,
this.viewContainerRef,
+ null,
+ DIALOG_CONFIG,
);
this.listenToDialogClose();
}
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.html
index 4d97b76b03..57d9280a6f 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit/organisations-einheit.component.html
@@ -1,2 +1,2 @@
-<p>{{ name }}</p>
+<p class="font-bold">{{ name }}</p>
<p>{{ address }}</p>
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index 756603f0f9..94daf75f68 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -10,8 +10,8 @@ import {
CollaborationIconComponent,
InstantSearchComponent,
SaveIconComponent,
+ SearchIconComponent,
} from '@ods/system';
-import { SearchIconComponent } from 'libs/design-system/src/lib/icons/search-icon/search-icon.component';
import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang-container.component';
import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-container/collaboration-request-form/collaboration-request-form.component';
import { OrganisationsEinheitContainerComponent } from './collaboration-in-vorgang-container/collaboration-request-form/organisations-einheit-container/organisations-einheit-container.component';
diff --git a/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.ts b/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.ts
index aeb0eac486..2e49ca660d 100644
--- a/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.ts
+++ b/alfa-client/libs/collaboration/src/lib/search-organisations-einheit-container/search-organisations-einheit-form/search-organisations-einheit-form.component.ts
@@ -1,6 +1,6 @@
import { OrganisationsEinheitResource } from '@alfa-client/collaboration-shared';
import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { InstantSearchResult } from 'libs/design-system/src/lib/instant-search/instant-search/instant-search.model';
+import { InstantSearchResult } from '@ods/system';
import { SearchOrganisationsEinheitFormService } from '../search-organisations-einheit.formservice';
@Component({
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 9a59b13cbc..f70af207f2 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -19,8 +19,10 @@ export * from './lib/icons/exclamation-icon/exclamation-icon.component';
export * from './lib/icons/file-icon/file-icon.component';
export * from './lib/icons/iconVariants';
export * from './lib/icons/save-icon/save-icon.component';
+export * from './lib/icons/search-icon/search-icon.component';
export * from './lib/icons/send-icon/send-icon.component';
export * from './lib/icons/spinner-icon/spinner-icon.component';
export * from './lib/icons/stamp-icon/stamp-icon.component';
export * from './lib/instant-search/instant-search/instant-search.component';
+export * from './lib/instant-search/instant-search/instant-search.model';
export * from './lib/testbtn/testbtn.component';
diff --git a/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js b/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
index 1c7b298d5a..2fe29cc4a3 100644
--- a/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
+++ b/alfa-client/libs/design-system/src/lib/tailwind-preset/tailwind.config.js
@@ -100,6 +100,12 @@ module.exports = {
error: 'hsl(var(--color-error))',
focus: 'hsl(var(--color-focus))',
},
+ backgroundColor: {
+ greybackdrop: 'rgb(229, 229, 229, 0.95)',
+ },
+ backdropBlur: {
+ 1: '1px',
+ },
},
},
plugins: [],
--
GitLab