From 7b0c526fb87b923f74de5e3681d562a4daf62449 Mon Sep 17 00:00:00 2001
From: Jason Ng <jng@bitwarden.com>
Date: Wed, 7 Aug 2024 16:55:48 -0400
Subject: [PATCH] PM-10374 update margins in view v2 components (#10425)

---
 .../additional-options.component.html                  |  2 +-
 .../card-details/card-details-view.component.html      | 10 +++++-----
 .../item-details/item-details-v2.component.html        |  1 +
 .../item-history/item-history-v2.component.html        | 10 ++++++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/libs/vault/src/cipher-view/additional-options/additional-options.component.html b/libs/vault/src/cipher-view/additional-options/additional-options.component.html
index 59b2753945a..6f254b8c729 100644
--- a/libs/vault/src/cipher-view/additional-options/additional-options.component.html
+++ b/libs/vault/src/cipher-view/additional-options/additional-options.component.html
@@ -2,7 +2,7 @@
   <bit-section-header>
     <h2 bitTypography="h6">{{ "additionalOptions" | i18n }}</h2>
   </bit-section-header>
-  <bit-card>
+  <bit-card class="[&_bit-form-field:last-of-type]:tw-mb-0">
     <bit-form-field>
       <bit-label>{{ "note" | i18n }}</bit-label>
       <textarea readonly bitInput aria-readonly="true">{{ notes }}</textarea>
diff --git a/libs/vault/src/cipher-view/card-details/card-details-view.component.html b/libs/vault/src/cipher-view/card-details/card-details-view.component.html
index 588849eaee4..b83200cadae 100644
--- a/libs/vault/src/cipher-view/card-details/card-details-view.component.html
+++ b/libs/vault/src/cipher-view/card-details/card-details-view.component.html
@@ -2,8 +2,8 @@
   <bit-section-header>
     <h2 bitTypography="h6">{{ setSectionTitle }}</h2>
   </bit-section-header>
-  <bit-card>
-    <bit-form-field [disableMargin]="!card.number && !card.expiration && !card.code">
+  <bit-card class="[&_bit-form-field:last-of-type]:tw-mb-0">
+    <bit-form-field>
       <bit-label>{{ "cardholderName" | i18n }}</bit-label>
       <input
         readonly
@@ -14,7 +14,7 @@
         data-testid="cardholder-name"
       />
     </bit-form-field>
-    <bit-form-field *ngIf="card.number" [disableMargin]="!card.expiration && !card.code">
+    <bit-form-field *ngIf="card.number">
       <bit-label>{{ "number" | i18n }}</bit-label>
       <input
         readonly
@@ -42,7 +42,7 @@
         data-testid="copy-number"
       ></button>
     </bit-form-field>
-    <bit-form-field *ngIf="card.expiration" [disableMargin]="!card.code">
+    <bit-form-field *ngIf="card.expiration">
       <bit-label>{{ "expiration" | i18n }}</bit-label>
       <input
         readonly
@@ -53,7 +53,7 @@
         data-testid="cardholder-expiration"
       />
     </bit-form-field>
-    <bit-form-field *ngIf="card.code" disableMargin>
+    <bit-form-field *ngIf="card.code">
       <bit-label>{{ "securityCode" | i18n }}</bit-label>
       <input
         readonly
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 3bee39d5195..df9731570c7 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
@@ -22,6 +22,7 @@
     <ul
       [attr.aria-label]="'itemLocation' | i18n"
       *ngIf="cipher.collectionIds?.length || cipher.organizationId || cipher.folderId"
+      class="tw-mb-0"
     >
       <li
         *ngIf="cipher.organizationId && organization"
diff --git a/libs/vault/src/cipher-view/item-history/item-history-v2.component.html b/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
index 0515a4b24bc..4d86645c8bc 100644
--- a/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
+++ b/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
@@ -7,7 +7,13 @@
       <span class="tw-font-bold">{{ "lastEdited" | i18n }}:</span>
       {{ cipher.revisionDate | date: "medium" }}
     </p>
-    <p class="tw-mb-1 tw-text-xs tw-text-muted tw-select-none">
+    <p
+      class="tw-text-xs tw-text-muted tw-select-none"
+      [ngClass]="{
+        'tw-mb-1 ': cipher.hasPasswordHistory && isLogin,
+        'tw-mb-0': !cipher.hasPasswordHistory || !isLogin,
+      }"
+    >
       <span class="tw-font-bold">{{ "dateCreated" | i18n }}:</span>
       {{ cipher.creationDate | date: "medium" }}
     </p>
@@ -20,7 +26,7 @@
       {{ cipher.passwordRevisionDisplayDate | date: "medium" }}
     </p>
     <a
-      *ngIf="cipher.hasPasswordHistory"
+      *ngIf="cipher.hasPasswordHistory && isLogin"
       class="tw-font-bold tw-no-underline"
       routerLink="/cipher-password-history"
       [queryParams]="{ cipherId: cipher.id }"