diff --git a/assets/scss/components/stencil/returnDetails/_returnDetails.scss b/assets/scss/components/stencil/returnDetails/_returnDetails.scss index 900e9db44f..dd24a8d99b 100644 --- a/assets/scss/components/stencil/returnDetails/_returnDetails.scss +++ b/assets/scss/components/stencil/returnDetails/_returnDetails.scss @@ -23,37 +23,11 @@ margin: 0; } -.returnDetails-statusBadge { - display: inline-block; - padding: spacing("eighth") spacing("quarter"); - border-radius: remCalc(4px); - font-size: remCalc(11px); - font-weight: fontWeight("bold"); - letter-spacing: remCalc(1px); +// Status badge is shared with the returns list (.account-orderStatus-label); +.returnDetails-titleGroup .account-orderStatus-label { + font-family: $header-font-family; text-transform: uppercase; - background-color: stencilColor("returnStatus-closed-backgroundColor"); - color: stencilColor("returnStatus-closed-color"); -} - -// Status badges pair a background and text colour per variation -.returnDetails-statusBadge--open { - background-color: stencilColor("returnStatus-open-backgroundColor"); - color: stencilColor("returnStatus-open-color"); -} - -.returnDetails-statusBadge--in_progress { - background-color: stencilColor("returnStatus-inProgress-backgroundColor"); - color: stencilColor("returnStatus-inProgress-color"); -} - -.returnDetails-statusBadge--closed { - background-color: stencilColor("returnStatus-closed-backgroundColor"); - color: stencilColor("returnStatus-closed-color"); -} - -.returnDetails-statusBadge--cancelled { - background-color: stencilColor("returnStatus-cancelled-backgroundColor"); - color: stencilColor("returnStatus-cancelled-color"); + margin: 0; } .returnDetails-divider { diff --git a/templates/pages/account/return-details.html b/templates/pages/account/return-details.html index ef0c9dd234..98198c9f86 100644 --- a/templates/pages/account/return-details.html +++ b/templates/pages/account/return-details.html @@ -30,16 +30,16 @@

{{lang 'account.returns.heading'}}

{{lang 'account.returns.details.return_number' id=return_detail.rma}}

{{#if return_detail.status '===' 'OPEN'}} {{lang 'account.returns.details.status_label'}} - {{lang 'account.returns.status.open'}} + {{lang 'account.returns.status.open'}} {{else if return_detail.status '===' 'IN_PROGRESS'}} {{lang 'account.returns.details.status_label'}} - {{lang 'account.returns.status.in_progress'}} + {{lang 'account.returns.status.in_progress'}} {{else if return_detail.status '===' 'CLOSED'}} {{lang 'account.returns.details.status_label'}} - {{lang 'account.returns.status.closed'}} + {{lang 'account.returns.status.closed'}} {{else if return_detail.status '===' 'CANCELLED'}} {{lang 'account.returns.details.status_label'}} - {{lang 'account.returns.status.cancelled'}} + {{lang 'account.returns.status.cancelled'}} {{/if}} @@ -94,11 +94,11 @@

{{lang 'account.returns.summary'}}

{{lang 'account.returns.details.date_submitted'}}
-
{{moment return_detail.date_submitted format="MMMM D, YYYY"}}
+
{{moment return_detail.date_submitted format="Do MMM YYYY"}}
{{lang 'account.returns.details.last_update'}}
-
{{#if return_detail.last_updated}}{{moment return_detail.last_updated format="MMMM D, YYYY"}}{{else}}{{moment return_detail.date_submitted format="MMMM D, YYYY"}}{{/if}}
+
{{#if return_detail.last_updated}}{{moment return_detail.last_updated format="Do MMM YYYY"}}{{else}}{{moment return_detail.date_submitted format="Do MMM YYYY"}}{{/if}}
{{lang 'account.returns.details.order_number'}}