Merge branch 'main' into MAIN-B-21073

transcom · Oct 23, 2024 · 9fc25e1 · 9fc25e1
2 parents c6e9ab5 + 2fa4cbd
commit 9fc25e1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/src/components/ShipmentList/ShipmentList.jsx b/src/components/ShipmentList/ShipmentList.jsx
@@ -59,11 +59,11 @@ export const ShipmentListItem = ({
       }`}
       data-testid="shipment-list-item-container"
     >
-      <div>
+      <div className={styles['shipment-info']}>
         <strong>
           {getShipmentTypeLabel(shipment.shipmentType)}
           {showNumber && ` ${shipmentNumber}`}
-        </strong>{' '}
+        </strong>
         <br />
         {showShipmentTooltip &&
           (shipment.shipmentType === SHIPMENT_OPTIONS.HHG ||
@@ -84,7 +84,9 @@ export const ShipmentListItem = ({
       </div>
       {/* use substring of the UUID until actual shipment code is available */}
       {!showShipmentWeight && !showIncomplete && (
-        <span className={styles['shipment-code']}>#{shipment.shipmentLocator}</span>
+        <div className={styles['shipment-locator']}>
+          <span>#{shipment.shipmentLocator}</span>
+        </div>
       )}
       {showIncomplete && <Tag>Incomplete</Tag>}
       {showShipmentWeight && (
@@ -115,7 +117,7 @@ export const ShipmentListItem = ({
         </div>
       )}
       {canEditOrDelete ? (
-        <div className={styles['shipment-btns']}>
+        <div className={styles['shipment-buttons']}>
           <Button className={styles['edit-btn']} onClick={onDeleteClick} type="button">
             Delete
           </Button>

diff --git a/src/components/ShipmentList/ShipmentList.module.scss b/src/components/ShipmentList/ShipmentList.module.scss
@@ -8,36 +8,33 @@
   align-items: center;
   border-radius: 0 5px 5px 0;
   border: 1px solid $base-lighter;
-  padding-left: 6px;
-  padding-right: 13px;
-  padding-top: 12px;
-  padding-bottom: 12px;
+  padding: 12px 12px;
   height: 52px;
   @include u-margin-bottom(1);
 
-  strong {
-    white-space: nowrap;
-    @media (min-width: $tablet) {
-      @include u-minw(15);
-    }
-    @include u-minw(7);
-    text-align: left;
+  .shipment-info {
+    flex: 1;
   }
 
-  &:last-child {
-    margin-bottom: 0px;
+  .shipment-buttons {
+    flex: 1;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    margin: 0;
   }
 
   &.shipment-display {
     cursor: default;
     justify-content: start;
   }
-}
 
-.shipment-btns {
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  @media (max-width: 768px) {
+    .shipment-buttons {
+      margin-left: 3vw;
+      margin-right: -3vw;
+    }
+  }
 }
 
 :global(.usa-button).edit-btn {