From 2103cb4591e53e9250f5c6e2203cc4bfd8efc898 Mon Sep 17 00:00:00 2001
From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com>
Date: Mon, 29 Jul 2024 15:38:06 -0500
Subject: [PATCH] [PM-10141] Fix name input styling (#10317)

* import FormFieldModule

* use bit-* form field elements so styling is consistent

* replace `readonly` with `disabled` so the field can not be interacted with

* standardize spacing around orgs/folders

* revert disable/readonly swap

* remove duplicate import
---
 .../item-details-v2.component.html            | 43 +++++++++----------
 .../item-details/item-details-v2.component.ts |  2 +-
 2 files changed, 21 insertions(+), 24 deletions(-)

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 ee8b17e71c..efb0374d45 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,21 +3,19 @@
     <h2 bitTypography="h6">{{ "itemDetails" | i18n }}</h2>
   </bit-section-header>
   <bit-card>
-    <div>
-      <label class="tw-block tw-w-full tw-mb-1 tw-text-xs tw-text-muted tw-select-none">
+    <bit-form-field>
+      <bit-label>
         {{ "itemName" | i18n }}
-      </label>
-      <bit-form-field>
-        <input
-          readonly
-          bitInput
-          type="text"
-          [value]="cipher.name"
-          aria-readonly="true"
-          data-testid="item-name"
-        />
-      </bit-form-field>
-    </div>
+      </bit-label>
+      <input
+        readonly
+        bitInput
+        type="text"
+        [value]="cipher.name"
+        aria-readonly="true"
+        data-testid="item-name"
+      />
+    </bit-form-field>
 
     <ul
       [attr.aria-label]="'itemLocation' | i18n"
@@ -25,20 +23,19 @@
     >
       <li
         *ngIf="cipher.organizationId && organization"
-        class="tw-flex tw-list-none"
+        class="tw-flex tw-items-center tw-list-none"
         [ngClass]="{ 'tw-mb-3': cipher.collectionIds }"
         bitTypography="body2"
         [attr.aria-label]="('owner' | i18n) + organization.name"
         data-testid="owner"
       >
         <i
-          class="tw-pt-1"
           appOrgIcon
           [tierType]="organization.productTierType"
           [size]="'large'"
           [title]="'owner' | i18n"
         ></i>
-        <span aria-hidden="true" class="tw-pl-1 tw-mb-1">
+        <span aria-hidden="true" class="tw-pl-1.5">
           {{ organization.name }}
         </span>
       </li>
@@ -50,17 +47,17 @@
         <ul data-testid="collections">
           <li
             *ngFor="let collection of collections; let last = last"
-            class="tw-flex tw-list-none"
+            class="tw-flex tw-items-center tw-list-none"
             bitTypography="body2"
             [ngClass]="{ 'tw-mb-3': last }"
             [attr.aria-label]="collection.name"
           >
             <i
-              class="bwi bwi-collection bwi-lg tw-pt-1"
+              class="bwi bwi-collection bwi-lg"
               aria-hidden="true"
               [title]="'collection' | i18n"
             ></i>
-            <span aria-hidden="true" class="tw-pl-1 tw-mb-1">
+            <span aria-hidden="true" class="tw-pl-1.5">
               {{ collection.name }}
             </span>
           </li>
@@ -69,12 +66,12 @@
       <li
         *ngIf="cipher.folderId && folder"
         bitTypography="body2"
-        class="tw-flex tw-list-none"
+        class="tw-flex tw-items-center tw-list-none"
         [attr.aria-label]="('folder' | i18n) + folder.name"
         data-testid="folder"
       >
-        <i class="bwi bwi-folder bwi-lg tw-pt-1" aria-hidden="true" [title]="'folder' | i18n"></i>
-        <span aria-hidden="true" class="tw-pl-1 tw-mb-1">{{ folder.name }} </span>
+        <i class="bwi bwi-folder bwi-lg" aria-hidden="true" [title]="'folder' | i18n"></i>
+        <span aria-hidden="true" class="tw-pl-1.5">{{ folder.name }} </span>
       </li>
     </ul>
   </bit-card>
diff --git a/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts b/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
index e490c7c00d..30e8ad1ecd 100644
--- a/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
+++ b/libs/vault/src/cipher-view/item-details/item-details-v2.component.ts
@@ -8,10 +8,10 @@ import { CollectionView } from "@bitwarden/common/vault/models/view/collection.v
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import {
   CardComponent,
+  FormFieldModule,
   SectionComponent,
   SectionHeaderComponent,
   TypographyModule,
-  FormFieldModule,
 } from "@bitwarden/components";
 
 import { OrgIconDirective } from "../../components/org-icon.directive";