diff --git a/app/views/spree/admin/orders/_table_row.html.haml b/app/views/spree/admin/orders/_table_row.html.haml index b25b7c2c1a..aa72f0823a 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,27 +14,27 @@ %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'} + %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 %span = "(#{order.display_outstanding_balance})" - %td.align-center + %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" } = 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..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; @@ -136,7 +135,7 @@ table { thead { th { - padding: 10px; + padding: 5px; border-bottom: none; background-color: $color-tbl-thead-bg; color: $color-tbl-thead-txt;