From ae61efe39ab4304ff843ff28bda4d2dfd10e6755 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Thu, 17 Aug 2017 23:10:11 +0200 Subject: [PATCH 1/2] Fix action button hover style The action button elements must not have a backgorund color on mosue hover. Also fixes the icon hover color for shippment table action buttons. --- .../assets/stylesheets/spree/backend/shared/_tables.scss | 7 ++++++- 1 file changed, 6 insertions(+), 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 627faa0faa0..361381e4fa9 100644 --- a/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss +++ b/backend/app/assets/stylesheets/spree/backend/shared/_tables.scss @@ -50,6 +50,10 @@ table { background-color: transparent; border: 0 none; padding: 0 !important; + + &:hover { + background-color: transparent; + } } .fa-envelope-alt, .fa-eye-open { @@ -69,7 +73,8 @@ table { color: theme-color("warning"); } - .fa-edit:hover, .fa-capture:hover, .fa-ok:hover, .fa-plus:hover, .fa-save:hover { + .fa-edit:hover, .fa-capture:hover, .fa-ok:hover, .fa-plus:hover, + .fa-save:hover, .fa-arrows-h:hover, .fa-check:hover { color: theme-color("success"); } From a16a09a46fc221660e2712f091bc19409c60b1a8 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Thu, 17 Aug 2017 23:41:29 +0200 Subject: [PATCH 2/2] Fixes order shipment action button tooltip color The shipment manifest action buttons have unknown action types defined. This leads to the tooltip using the wrong background color. --- .../app/views/spree/admin/orders/_shipment_manifest.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb b/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb index c2f5fe8411e..8ff0c4ce543 100644 --- a/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb +++ b/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb @@ -22,8 +22,8 @@ <% if can? :update, item %> - <%= button_tag '', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: { action: 'split', 'variant-id' => item.variant.id }, title: Spree.t('actions.split'), type: :button %> - <%= button_tag '', class: 'delete-item fa fa-trash no-text with-tip', data: { 'variant-id' => item.variant.id }, title: Spree.t('actions.delete'), type: :button %> + <%= button_tag '', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: { action: 'edit', 'variant-id' => item.variant.id }, title: Spree.t('actions.split'), type: :button %> + <%= button_tag '', class: 'delete-item fa fa-trash no-text with-tip', data: { action: 'remove', 'variant-id' => item.variant.id }, title: Spree.t('actions.delete'), type: :button %> <% end %>