Skip to content
Snippets Groups Projects
Commit 206ce780 authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'OZG-6676-OZG-7027-responsive-design' (#801) from...

Merge pull request 'OZG-6676-OZG-7027-responsive-design' (#801) from OZG-6676-OZG-7027-responsive-design into master

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


Reviewed-by: default avatarOZGCloud <ozgcloud@mgm-tp.com>
parents ab3f7a15 7bdcdd07
Branches
Tags
No related merge requests found
...@@ -5,12 +5,14 @@ ...@@ -5,12 +5,14 @@
}" }"
> >
<alfa-organisations-einheit-container <alfa-organisations-einheit-container
class="flex flex-1"
*ngIf="showOrganisationsEinheitAnfrageButton" *ngIf="showOrganisationsEinheitAnfrageButton"
data-test-id="organisations-einheit-container" data-test-id="organisations-einheit-container"
[vorgang]="vorgang" [vorgang]="vorgang"
[collaborationListResource]="collaborationStateListResource.resource" [collaborationListResource]="collaborationStateListResource.resource"
></alfa-organisations-einheit-container> ></alfa-organisations-einheit-container>
<alfa-externe-fachstelle-container <alfa-externe-fachstelle-container
class="flex flex-1"
*ngIf="showExterneFachstelleAnfrageButton" *ngIf="showExterneFachstelleAnfrageButton"
data-test-id="externe-fachstelle-container" data-test-id="externe-fachstelle-container"
[vorgang]="vorgang" [vorgang]="vorgang"
......
...@@ -11,12 +11,11 @@ ...@@ -11,12 +11,11 @@
></alfa-collaboration-request-form> ></alfa-collaboration-request-form>
</ng-container> </ng-container>
<ng-template #anfrageErstellenButton> <ng-template #anfrageErstellenButton>
<div class="flex w-111 justify-between bg-background-100 p-4 shadow-md"> <div class="flex flex-1 gap-3 border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
<ods-external-unit-icon /> <ods-external-unit-icon />
<div class="flex w-44 flex-col text-base"> <div class="flex flex-1 flex-col text-base">
<p class="text-primary">Externe Fachstelle</p> <p class="text-primary">Externe Fachstelle</p>
<p class="text-text">Private Organisation,</p> <p class="text-text">Private Organisation, Verein, Schule</p>
<p class="text-text">Verein, Schule</p>
</div> </div>
<alfa-anfrage-erstellen-button data-test-id="externe-fachstelle-anfrage-erstellen-button" (clickEmitter)="showForm()" /> <alfa-anfrage-erstellen-button data-test-id="externe-fachstelle-anfrage-erstellen-button" (clickEmitter)="showForm()" />
</div> </div>
......
...@@ -11,12 +11,11 @@ ...@@ -11,12 +11,11 @@
></alfa-collaboration-request-form> ></alfa-collaboration-request-form>
</ng-container> </ng-container>
<ng-template #anfrageErstellenButton> <ng-template #anfrageErstellenButton>
<div class="flex w-111 justify-between bg-background-100 p-4 shadow-md"> <div class="flex flex-1 gap-3 border border-grayborder bg-background-100 bg-background-100 p-4 p-4 shadow shadow-grayborder">
<ods-public-administration-icon /> <ods-public-administration-icon />
<div class="flex w-44 flex-col text-base"> <div class="flex flex-1 flex-col text-base">
<p class="text-primary">Öffentliche Verwaltung</p> <p class="text-primary">Öffentliche Verwaltung</p>
<p class="text-text">Kommune, Amt,</p> <p class="text-text">Kommune, Amt, Ministerium</p>
<p class="text-text">Ministerium</p>
</div> </div>
<alfa-anfrage-erstellen-button data-test-id="organisations-einheit-anfrage-erstellen-button" (clickEmitter)="showForm()" /> <alfa-anfrage-erstellen-button data-test-id="organisations-einheit-anfrage-erstellen-button" (clickEmitter)="showForm()" />
</div> </div>
......
...@@ -45,9 +45,6 @@ module.exports = { ...@@ -45,9 +45,6 @@ module.exports = {
maxHeight: { maxHeight: {
120: '480px', 120: '480px',
}, },
width: {
111: '444px',
},
colors: { colors: {
ozgblue: { ozgblue: {
50: 'hsl(200, 100%, 96%)', 50: 'hsl(200, 100%, 96%)',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment