Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

INT B-21549 #13931

Merged
merged 4 commits into from
Oct 17, 2024
Merged

INT B-21549 #13931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
448ba68
initial commit, styling added, should be g2g
danieljordan-caci Oct 16, 2024
61aece6
Merge remote-tracking branch 'origin/MAIN-21549' into INT-B-21549
danieljordan-caci Oct 16, 2024
4c60aef
removed unused css styling after update
danieljordan-caci Oct 16, 2024
1ea87f0
Merge branch 'integrationTesting' into INT-B-21549
danieljordan-caci Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/components/ShipmentList/ShipmentList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,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 ||
Expand All @@ -85,7 +85,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 && (
Expand Down Expand Up @@ -116,7 +118,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>
Expand Down
33 changes: 15 additions & 18 deletions src/components/ShipmentList/ShipmentList.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down