From 6ca98d497acb3b6e25eae582ecd55818c8c3d933 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 14 Dec 2023 10:06:19 +1100 Subject: [PATCH] Remove unnecessary 'blue' class Buttons are already blue. And we don't want the text to be blue. This resolves #11865 --- app/views/spree/admin/overview/_enterprises.html.haml | 2 +- app/views/spree/admin/overview/_enterprises_header.html.haml | 2 +- app/views/spree/admin/overview/_order_cycles.html.haml | 4 ++-- app/views/spree/admin/overview/_products.html.haml | 4 ++-- app/webpacker/css/admin_v3/dashboard/dashboard_item.scss | 4 ---- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/views/spree/admin/overview/_enterprises.html.haml b/app/views/spree/admin/overview/_enterprises.html.haml index e022623928..ed3d93e663 100644 --- a/app/views/spree/admin/overview/_enterprises.html.haml +++ b/app/views/spree/admin/overview/_enterprises.html.haml @@ -27,6 +27,6 @@ %div.sixteen.columns.alpha.list = render partial: 'enterprise_row', collection: @enterprises, as: :enterprise - %a.sixteen.columns.alpha.button.bottom.blue{ href: "#{main_app.admin_enterprises_path}" } + %a.sixteen.columns.alpha.button.bottom{ href: "#{main_app.admin_enterprises_path}" } = t "spree_admin_overview_enterprises_footer" %span.icon-arrow-right diff --git a/app/views/spree/admin/overview/_enterprises_header.html.haml b/app/views/spree/admin/overview/_enterprises_header.html.haml index a189fe40d6..26b501556f 100644 --- a/app/views/spree/admin/overview/_enterprises_header.html.haml +++ b/app/views/spree/admin/overview/_enterprises_header.html.haml @@ -3,7 +3,7 @@ = t "spree_admin_overview_enterprises_header" - if @enterprises.any? - if spree_current_user.can_own_more_enterprises? - %a.three.columns.omega.icon-plus.button.blue.white-bottom{ href: "#{main_app.new_admin_enterprise_path}" } + %a.three.columns.omega.icon-plus.button.white-bottom{ href: "#{main_app.new_admin_enterprise_path}" } = t "spree_admin_enterprises_create_new" - else %a{ "ofn-with-tip" => t('.ofn_with_tip') } diff --git a/app/views/spree/admin/overview/_order_cycles.html.haml b/app/views/spree/admin/overview/_order_cycles.html.haml index 8ce3ff3d73..dcf288df6e 100644 --- a/app/views/spree/admin/overview/_order_cycles.html.haml +++ b/app/views/spree/admin/overview/_order_cycles.html.haml @@ -1,11 +1,11 @@ -- color_class = @order_cycle_count > 0 ? "blue" : "red" +- color_class = @order_cycle_count > 0 ? "" : "red" - icon_class = @order_cycle_count > 0 ? "icon-ok-sign" : "icon-warning-sign" %div.dashboard_item.seven.columns.omega#order_cycles %div.header.sixteen.columns.alpha{class: color_class} %h3.ten.columns.alpha = t ".order_cycles" - if @order_cycle_count > 0 - %a.six.columns.omega.icon-plus.button.blue{ href: main_app.new_admin_order_cycle_path } + %a.six.columns.omega.icon-plus.button{ href: main_app.new_admin_order_cycle_path } = t "spree_admin_enterprises_create_new" - else %a{ "ofn-with-tip" => t(".order_cycles_tip") } diff --git a/app/views/spree/admin/overview/_products.html.haml b/app/views/spree/admin/overview/_products.html.haml index c1e3aa1d11..f797e2b2fd 100644 --- a/app/views/spree/admin/overview/_products.html.haml +++ b/app/views/spree/admin/overview/_products.html.haml @@ -3,7 +3,7 @@ %h3.ten.columns.alpha = t "products" - if @product_count > 0 - %a.six.columns.omega.icon-plus.button.blue{ href: "#{new_admin_product_path}" } + %a.six.columns.omega.icon-plus.button{ href: "#{new_admin_product_path}" } = t "spree_admin_enterprises_create_new" - else %a{ "ofn-with-tip" => t(".products_tip") } @@ -15,7 +15,7 @@ = t(".active_products", count: @product_count ) %span.three.columns.omega %span.icon-ok-sign - %a.sixteen.columns.alpha.button.bottom.blue{ href: "#{admin_products_path}" } + %a.sixteen.columns.alpha.button.bottom{ href: "#{admin_products_path}" } = t "spree_admin_enterprises_producers_manage_products" %span.icon-arrow-right - else diff --git a/app/webpacker/css/admin_v3/dashboard/dashboard_item.scss b/app/webpacker/css/admin_v3/dashboard/dashboard_item.scss index 17fd5c8015..f64b0a2a7b 100644 --- a/app/webpacker/css/admin_v3/dashboard/dashboard_item.scss +++ b/app/webpacker/css/admin_v3/dashboard/dashboard_item.scss @@ -195,10 +195,6 @@ div.dashboard_item { font-weight: bold; text-align: center; - &.blue { - background-color: $spree-blue; - } - &.red { background-color: $color-warning; }