From 7a412311f142c9bbd5118b547394b6fc2244a994 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Thu, 6 Apr 2017 23:48:45 +0200 Subject: [PATCH 1/4] Add .wrap-text class to table headers Some table headers carry too much information in them (like the reimbursements and customer returns tables). With the recent changes we made in 0dcc02823fd73989eeca24a89b212c4027976a8e all table headers have text wrapping disabled. We the introduction of the .wrap-text class we are able to turn text wrapping back on for certain headers. --- .../app/assets/stylesheets/spree/backend/shared/_tables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss b/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss index f278640c52b..94527a8b7e5 100644 --- a/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss +++ b/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss @@ -127,7 +127,7 @@ table { } - th, td.actions, td.no-wrap, .state { + th:not(.wrap-text), td.actions, td.no-wrap, .state { white-space: nowrap; } From 162e633ae4d5f40dbbb8c06dea8776d7dfe51a38 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Thu, 6 Apr 2017 23:53:31 +0200 Subject: [PATCH 2/4] Wrap text in reimbursement table headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the recent changes to table headers in 0dcc02823fd73989eeca24a89b212c4027976a8e text doesn’t wrap. The reimbursement and customer returns table headers carry too much information in them. Instead of rewriting these tables into forms right now, we re-enable text wrapping for this headers by using the newly introduced .wrap-text class. --- .../backend/sections/_return_authorizations.scss | 2 -- .../customer_returns/_return_item_decision.html.erb | 12 ++++++------ .../customer_returns/_return_item_selection.html.erb | 10 +++++----- .../views/spree/admin/reimbursements/edit.html.erb | 8 ++++---- .../views/spree/admin/reimbursements/show.html.erb | 8 ++++---- .../spree/admin/return_authorizations/_form.html.erb | 4 ++-- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/backend/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss b/backend/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss index 9d7ad54c855..eafd52a46c3 100644 --- a/backend/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss +++ b/backend/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss @@ -1,6 +1,4 @@ .return-items-table { - table-layout: fixed; - .refund-amount-input { width: 80px; } diff --git a/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb b/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb index 2034d7517f5..fb3098afd57 100644 --- a/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +++ b/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb @@ -3,13 +3,13 @@ <%= Spree::Product.model_name.human %> <%= Spree::Variant.human_attribute_name(:sku) %> - <%= Spree::ReturnItem.human_attribute_name(:amount) %> - <%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type) %> - <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> - <%= Spree::ReturnItem.human_attribute_name(:acceptance_status_errors) %> - <%= Spree::ReturnItem.human_attribute_name(:reception_status) %> + <%= Spree::ReturnItem.human_attribute_name(:amount) %> + <%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type) %> + <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> + <%= Spree::ReturnItem.human_attribute_name(:acceptance_status_errors) %> + <%= Spree::ReturnItem.human_attribute_name(:reception_status) %> <% unless return_items.all?(&:received?)%> - <%= Spree::ReturnItem.human_attribute_name(:item_received?) %> + <%= Spree::ReturnItem.human_attribute_name(:item_received?) %> <% end %> <% if show_decision %> diff --git a/backend/app/views/spree/admin/customer_returns/_return_item_selection.html.erb b/backend/app/views/spree/admin/customer_returns/_return_item_selection.html.erb index 5091969a429..3fe67bf2bf2 100644 --- a/backend/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +++ b/backend/app/views/spree/admin/customer_returns/_return_item_selection.html.erb @@ -6,12 +6,12 @@ <%= Spree::Product.model_name.human %> <%= Spree::Variant.human_attribute_name(:sku) %> - <%= Spree::ReturnItem.human_attribute_name(:amount) %> - <%= Spree::ReturnItem.human_attribute_name(:inventory_unit_state) %> - <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> + <%= Spree::ReturnItem.human_attribute_name(:amount) %> + <%= Spree::ReturnItem.human_attribute_name(:inventory_unit_state) %> + <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> <%= Spree::ReturnItem.human_attribute_name(:resellable) %> - <%= Spree::ReturnItem.human_attribute_name(:reception_status) %> - <%= Spree::ReturnItem.human_attribute_name(:return_reason) %> + <%= Spree::ReturnItem.human_attribute_name(:reception_status) %> + <%= Spree::ReturnItem.human_attribute_name(:return_reason) %> diff --git a/backend/app/views/spree/admin/reimbursements/edit.html.erb b/backend/app/views/spree/admin/reimbursements/edit.html.erb index 9b3289c4685..92fee0e113b 100644 --- a/backend/app/views/spree/admin/reimbursements/edit.html.erb +++ b/backend/app/views/spree/admin/reimbursements/edit.html.erb @@ -16,11 +16,11 @@ <%= Spree::Product.model_name.human %> - <%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %> - <%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %> - <%= Spree::ReturnItem.human_attribute_name(:amount) %> + <%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %> + <%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %> + <%= Spree::ReturnItem.human_attribute_name(:amount) %> <%= Spree::ReturnItem.human_attribute_name(:total) %> - <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> + <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> diff --git a/backend/app/views/spree/admin/reimbursements/show.html.erb b/backend/app/views/spree/admin/reimbursements/show.html.erb index cc82734cf44..70c954951ea 100644 --- a/backend/app/views/spree/admin/reimbursements/show.html.erb +++ b/backend/app/views/spree/admin/reimbursements/show.html.erb @@ -15,10 +15,10 @@ <%= Spree::Product.model_name.human %> - <%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %> - <%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %> - <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> - <%= Spree::ReturnItem.human_attribute_name(:amount) %> + <%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %> + <%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %> + <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> + <%= Spree::ReturnItem.human_attribute_name(:amount) %> <%= Spree::ReturnItem.human_attribute_name(:total) %> diff --git a/backend/app/views/spree/admin/return_authorizations/_form.html.erb b/backend/app/views/spree/admin/return_authorizations/_form.html.erb index 374f1469175..917a4ebf31e 100644 --- a/backend/app/views/spree/admin/return_authorizations/_form.html.erb +++ b/backend/app/views/spree/admin/return_authorizations/_form.html.erb @@ -12,8 +12,8 @@ <%= Spree::Product.model_name.human %> <%= Spree::ReturnAuthorization.human_attribute_name(:state) %> <%= Spree::ReturnItem.human_attribute_name(:charged) %> - <%= Spree::ReturnItem.human_attribute_name(:amount) %> - <%= Spree::ReimbursementType.model_name.human %> + <%= Spree::ReturnItem.human_attribute_name(:amount) %> + <%= Spree::ReimbursementType.model_name.human %> <%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %> <%= Spree::ReturnItem.human_attribute_name(:return_reason) %> From 61f3e19623e22d8056d06b50569520724d9477f4 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Fri, 7 Apr 2017 00:23:14 +0200 Subject: [PATCH 3/4] Wrap text in store credit table headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the recent changes to table headers in 0dcc02823fd73989eeca24a89b212c4027976a8e text doesn’t wrap. The store credit table headers have long texts. We re-enable text wrapping for this headers by using the newly introduced .wrap-text class. --- .../views/spree/admin/store_credits/index.html.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/app/views/spree/admin/store_credits/index.html.erb b/backend/app/views/spree/admin/store_credits/index.html.erb index 8f43f096173..6294ebdd14b 100644 --- a/backend/app/views/spree/admin/store_credits/index.html.erb +++ b/backend/app/views/spree/admin/store_credits/index.html.erb @@ -18,13 +18,13 @@ - - - - - - - + + + + + + + From f31fd0dc0d07c84ac660bda71af45b9f1e142c71 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Fri, 7 Apr 2017 00:24:30 +0200 Subject: [PATCH 4/4] Vertically align table headers to the top The bootstrap default is bottom alignment. Unfortunately there is no variable in Bootstrap to change that. --- backend/app/assets/stylesheets/spree/backend/shared/_tables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss b/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss index 94527a8b7e5..4a9fd22e3ac 100644 --- a/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss +++ b/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss @@ -138,6 +138,7 @@ table { background-color: $color-tbl-thead; text-align: center; font-weight: $font-weight-bold; + vertical-align: top; } }
<%= Spree::StoreCredit.human_attribute_name(:amount_credited) %><%= Spree::StoreCredit.human_attribute_name(:amount_used) %><%= Spree::StoreCredit.human_attribute_name(:amount_authorized) %><%= Spree::StoreCredit.human_attribute_name(:category_id) %><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %><%= Spree::StoreCredit.human_attribute_name(:created_at) %><%= Spree::StoreCredit.human_attribute_name(:invalidated_at) %><%= Spree::StoreCredit.human_attribute_name(:amount_credited) %><%= Spree::StoreCredit.human_attribute_name(:amount_used) %><%= Spree::StoreCredit.human_attribute_name(:amount_authorized) %><%= Spree::StoreCredit.human_attribute_name(:category_id) %><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %><%= Spree::StoreCredit.human_attribute_name(:created_at) %><%= Spree::StoreCredit.human_attribute_name(:invalidated_at) %>