From 2020a9fa7640904c125e598904de3c182b998bda Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Fri, 6 Oct 2023 15:10:45 -0400 Subject: [PATCH 1/3] changed table row alignment to align-left and removed padding from table header --- app/views/spree/admin/orders/_table_row.html.haml | 14 +++++++------- app/webpacker/css/admin_v3/shared/tables.scss | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/spree/admin/orders/_table_row.html.haml b/app/views/spree/admin/orders/_table_row.html.haml index b25b7c2c1a..678acbb6eb 100644 --- a/app/views/spree/admin/orders/_table_row.html.haml +++ b/app/views/spree/admin/orders/_table_row.html.haml @@ -1,9 +1,9 @@ %tr{ id: dom_id(order), class: "state-#{order.state}" } - %td.align-center + %td.align-left %input{type: 'checkbox', value: order.id, name: 'bulk_ids[]', "data-checked-target": "checkbox", "data-action": "change->checked#toggleCheckbox" } - %td.align-center + %td.align-left = order.distributor.name - %td.align-center + %td.align-left = I18n.l(order.completed_at, format: '%B %d, %Y') if order.completed_at %td %a{ href: edit_admin_order_path(order) } @@ -14,10 +14,10 @@ %div{ "data-controller": "tooltip", "data-tooltip-tip-value": order.special_instructions.to_s } %span.icon-warning-sign{ "data-tooltip-target": "element" } = t('spree.admin.orders.index.note') - %td.align-center + %td.align-left %span.state{ class: order.state.to_s } = t('js.admin.orders.order_state.' + order.state.to_s) - %td.align-center + %td.align-left - if order.payment_state %span.state{class: 'order.payment_state'} %a{href: spree.admin_order_payments_path(order) } @@ -25,7 +25,7 @@ - if order.display_outstanding_balance %span = "(#{order.display_outstanding_balance})" - %td.align-center + %td.align-left - if order.shipment_state %span.state{class: order.shipment_state.to_s} = t('js.admin.orders.shipment_states.' + order.shipment_state.to_s) @@ -34,7 +34,7 @@ = order.email %td = order&.bill_address&.full_name_for_sorting - %td.align-center + %td.align-left %span = order.display_total %td.actions diff --git a/app/webpacker/css/admin_v3/shared/tables.scss b/app/webpacker/css/admin_v3/shared/tables.scss index 44ec51060c..c9508525ef 100644 --- a/app/webpacker/css/admin_v3/shared/tables.scss +++ b/app/webpacker/css/admin_v3/shared/tables.scss @@ -136,7 +136,7 @@ table { thead { th { - padding: 10px; + padding: 5px; border-bottom: none; background-color: $color-tbl-thead-bg; color: $color-tbl-thead-txt; From e234b71b252f44e197e22b4e202632fd94d1419e Mon Sep 17 00:00:00 2001 From: lauriejefferson Date: Wed, 11 Oct 2023 14:57:43 -0400 Subject: [PATCH 2/3] removed empty spaces --- app/webpacker/css/admin_v3/shared/tables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/webpacker/css/admin_v3/shared/tables.scss b/app/webpacker/css/admin_v3/shared/tables.scss index c9508525ef..7e187099fb 100644 --- a/app/webpacker/css/admin_v3/shared/tables.scss +++ b/app/webpacker/css/admin_v3/shared/tables.scss @@ -2,7 +2,6 @@ table { width: 100%; margin-bottom: 15px; border-collapse: separate; - th, td { padding: 7px 5px; From 6e6854f56498d186c2d10dce80ab42973a39f75a Mon Sep 17 00:00:00 2001 From: David Cook Date: Fri, 13 Oct 2023 12:32:50 +1100 Subject: [PATCH 3/3] Fix payment state indicator Now the correct class is added, we can see the little coloured circles again. --- app/views/spree/admin/orders/_table_row.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/spree/admin/orders/_table_row.html.haml b/app/views/spree/admin/orders/_table_row.html.haml index 678acbb6eb..aa72f0823a 100644 --- a/app/views/spree/admin/orders/_table_row.html.haml +++ b/app/views/spree/admin/orders/_table_row.html.haml @@ -19,7 +19,7 @@ = t('js.admin.orders.order_state.' + order.state.to_s) %td.align-left - if order.payment_state - %span.state{class: 'order.payment_state'} + %span.state{ class: order.payment_state.to_s } %a{href: spree.admin_order_payments_path(order) } = t('js.admin.orders.payment_states.' + order.payment_state.to_s) - if order.display_outstanding_balance @@ -27,7 +27,7 @@ = "(#{order.display_outstanding_balance})" %td.align-left - if order.shipment_state - %span.state{class: order.shipment_state.to_s} + %span.state{ class: order.shipment_state.to_s} = t('js.admin.orders.shipment_states.' + order.shipment_state.to_s) %td %a{ href: "mailto:#{order.email}", target: "_blank" }