From 46c50d4ec551a546300563dfde540cf605f6c3ab Mon Sep 17 00:00:00 2001
From: Yanick Minder <minder@puzzle.ch>
Date: Mon, 4 Nov 2024 14:58:55 +0100
Subject: [PATCH] fix check in metric

---
 .../check-in-form-metric.component.html       | 48 +++++++++++--------
 .../invite-user-dialog.component.html         |  4 +-
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.html b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.html
index 8a8b7c5bc0..3c796f384f 100644
--- a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.html
+++ b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.html
@@ -1,28 +1,34 @@
-<div class="okr-form-row okr-form-label-input-container">
-  <label class="okr-form-label okr-form-col" for="value">Neuer Wert</label>
+<div class="okr-form-row row-cols-2">
   <div class="col">
-    <form [formGroup]="dialogForm" class="okr-form-row align-items-center">
+    <div class="okr-form-row okr-form-label-input-container">
+      <label class="okr-form-label okr-form-col" for="value">Neuer Wert</label>
       <div class="col">
-        <input
-          class="dialog-form-field"
-          [attr.data-testId]="'check-in-metric-value'"
-          [ngClass]="formInputCheck(dialogForm, 'value')"
-          formControlName="value"
-          id="value"
-        />
-      </div>
+        <form [formGroup]="dialogForm" class="okr-form-row align-items-center">
+          <div class="col">
+            <input
+              class="dialog-form-field pe-0"
+              [attr.data-testId]="'check-in-metric-value'"
+              [ngClass]="formInputCheck(dialogForm, 'value')"
+              formControlName="value"
+              id="value"
+            />
+          </div>
 
-      <span class="okr-form-label col-auto h-fit">{{ generateUnitLabel() }}</span>
-    </form>
+          <span class="okr-form-label col-auto h-fit ps-0">{{ generateUnitLabel() }}</span>
+        </form>
+      </div>
+      <mat-error *ngIf="hasFormFieldErrors(dialogForm, 'value')">
+        <span>{{ getErrorMessage("MUST_BE_NUMBER", "Neuer Wert") }}</span>
+      </mat-error>
+    </div>
   </div>
-  <mat-error *ngIf="hasFormFieldErrors(dialogForm, 'value')">
-    <span>{{ getErrorMessage("MUST_BE_NUMBER", "Neuer Wert") }}</span>
-  </mat-error>
-</div>
 
-<div *ngIf="checkIn.value" class="okr-form-row okr-form-label-input-container">
-  <p class="okr-form-label okr-form-col">Letzter Wert</p>
-  <div class="okr-form-col text-black">
-    <div class="dialog-data-show w-100">{{ checkIn.value }} {{ generateUnitLabel() }}</div>
+  <div class="col">
+    <div *ngIf="checkIn.value" class="okr-form-row okr-form-label-input-container">
+      <p class="okr-form-label okr-form-col">Letzter Wert</p>
+      <div class="okr-form-col text-black">
+        <div class="dialog-data-show dialog-form-field py-2">{{ checkIn.value }} {{ generateUnitLabel() }}</div>
+      </div>
+    </div>
   </div>
 </div>
diff --git a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.html b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.html
index 28e35c268c..74ffc40975 100644
--- a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.html
+++ b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.html
@@ -11,8 +11,8 @@
       </div>
     }
     <div class="okr-form-row">
-      <button (click)="addUser()" class="px-0 mb-3 pe-2 align-new-icon col-auto" color="primary" mat-button>
-        <span class="d-flex align-items-center fw-bold add-text">
+      <button (click)="addUser()" class="col-auto" color="primary" mat-button>
+        <span class="d-flex align-items-center fw-bold">
           <img alt="Add User button" class="add-cross-button" src="/assets/icons/new-icon.svg" />
           Weiterer Member hinzufügen
         </span>