From d6f57149d98659dd9697b14183eb36904780c979 Mon Sep 17 00:00:00 2001
From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com>
Date: Thu, 1 Aug 2024 10:48:09 -0500
Subject: [PATCH] [PM-10375] Remove Identity Margin (#10349)

* remove margin from the last form field across identity sections

* remove bottom margin from the item name when it is the only field

* replace JS margin solution with CSS
---
 .../custom-fields/custom-fields-v2.component.html           | 2 +-
 .../cipher-view/item-details/item-details-v2.component.html | 6 ++++--
 .../view-identity-sections.component.html                   | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
index 39d261d1bc7..7ffec66427b 100644
--- a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
+++ b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
@@ -4,7 +4,7 @@
   </bit-section-header>
   <bit-card>
     <div
-      class="tw-border-secondary-300"
+      class="tw-border-secondary-300 [&_bit-form-field:last-of-type]:tw-mb-0"
       *ngFor="let field of fields; let last = last"
       [ngClass]="{ 'tw-mb-4': !last }"
     >
diff --git a/libs/vault/src/cipher-view/item-details/item-details-v2.component.html b/libs/vault/src/cipher-view/item-details/item-details-v2.component.html
index efb0374d45a..3bee39d5195 100644
--- a/libs/vault/src/cipher-view/item-details/item-details-v2.component.html
+++ b/libs/vault/src/cipher-view/item-details/item-details-v2.component.html
@@ -3,7 +3,9 @@
     <h2 bitTypography="h6">{{ "itemDetails" | i18n }}</h2>
   </bit-section-header>
   <bit-card>
-    <bit-form-field>
+    <bit-form-field
+      [disableMargin]="!cipher.collectionIds?.length && !cipher.organizationId && !cipher.folderId"
+    >
       <bit-label>
         {{ "itemName" | i18n }}
       </bit-label>
@@ -19,7 +21,7 @@
 
     <ul
       [attr.aria-label]="'itemLocation' | i18n"
-      *ngIf="cipher.collectionIds || cipher.organizationId || cipher.folderId"
+      *ngIf="cipher.collectionIds?.length || cipher.organizationId || cipher.folderId"
     >
       <li
         *ngIf="cipher.organizationId && organization"
diff --git a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
index 742f3a5efe3..bd6ed2e00bd 100644
--- a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
+++ b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
@@ -3,7 +3,7 @@
     <h2 bitTypography="h6">{{ "personalDetails" | i18n }}</h2>
   </bit-section-header>
 
-  <bit-card>
+  <bit-card class="[&_bit-form-field:last-of-type]:tw-mb-0">
     <bit-form-field *ngIf="cipher.identity.fullName">
       <bit-label>{{ "name" | i18n }}</bit-label>
       <input bitInput [value]="cipher.identity.fullName" readonly data-testid="name" />
@@ -48,7 +48,7 @@
     <h2 bitTypography="h6">{{ "identification" | i18n }}</h2>
   </bit-section-header>
 
-  <bit-card>
+  <bit-card class="[&_bit-form-field:last-of-type]:tw-mb-0">
     <bit-form-field *ngIf="cipher.identity.ssn">
       <bit-label>{{ "ssn" | i18n }}</bit-label>
       <input bitInput type="password" [value]="cipher.identity.ssn" readonly data-testid="ssn" />
@@ -113,7 +113,7 @@
     <h2 bitTypography="h6">{{ "contactInfo" | i18n }}</h2>
   </bit-section-header>
 
-  <bit-card>
+  <bit-card class="[&_bit-form-field:last-of-type]:tw-mb-0">
     <bit-form-field *ngIf="cipher.identity.email">
       <bit-label>{{ "email" | i18n }}</bit-label>
       <input bitInput [value]="cipher.identity.email" readonly data-testid="email" />