From e3742c6951330cd7d2f19f3ec4b59af9151b9480 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 7 May 2024 00:43:19 +0200
Subject: [PATCH] OZG-5590 fix close button, attachment border workaround
---
.../binary-file2/binary-file2.component.html | 21 ++++++++++---------
.../attachment-container.component.ts | 2 +-
.../lib/attachment/attachment.component.ts | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
index df18911b69..32c230127b 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
@@ -6,14 +6,15 @@
[attr.aria-label]="'Anhang: Dateiname: ' + file.name"
[isLoading]="isLoading"
>
- <button
- close
- *ngIf="deletable"
- class="absolute right-2 top-1/2 flex size-10 -translate-y-1/2 items-center justify-center rounded-md hover:border hover:border-ozggray-600 hover:bg-ozggray-100"
- (click)="deleteFile()"
- title="Anhang löschen"
- aria-label="Anhang löschen Button"
- >
- <ods-close-icon></ods-close-icon>
- </button>
+ <div close class="flex-shrink">
+ <button
+ *ngIf="deletable"
+ class="flex size-10 items-center justify-center rounded-md hover:border hover:border-ozggray-600 hover:bg-ozggray-100"
+ (click)="deleteFile()"
+ title="Anhang löschen"
+ aria-label="Anhang löschen Button"
+ >
+ <ods-close-icon></ods-close-icon>
+ </button>
+ </div>
</ods-attachment>
diff --git a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.ts b/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.ts
index 1308ea083b..f047d7e014 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.component.ts
@@ -5,7 +5,7 @@ import { Component } from '@angular/core';
selector: 'ods-attachment-container',
standalone: true,
imports: [CommonModule],
- template: `<div class="mb-6 block rounded-md border border-black/25 shadow">
+ template: `<div class="mb-6 block overflow-hidden rounded-md border border-black/25 shadow">
<ng-content></ng-content>
</div>`,
})
diff --git a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
index cf77b13c9c..94185c9b02 100644
--- a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
@@ -10,7 +10,7 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
imports: [CommonModule, SpinnerIconComponent, FileIconComponent],
styles: [':host {@apply flex border-b border-black/25 last:border-b-0}'],
template: `<button
- class="relative flex w-full gap-3 rounded-md border bg-background-100 px-3 py-2 last:border-none hover:bg-ozggray-200"
+ class="relative flex w-full gap-3 border-b bg-background-100 px-3 py-2 hover:bg-ozggray-200"
>
<div class="flex-shrink">
<ods-file-icon *ngIf="!isLoading" [fileType]="fileType" size="large" />
--
GitLab