From 1cfa1be02be17bf65bd391985dd574a4a117715a Mon Sep 17 00:00:00 2001 From: Aweys Ahmed Date: Wed, 19 Jun 2024 22:03:34 -0400 Subject: [PATCH 1/2] edited css file to make message less omnious --- app/assets/stylesheets/application.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index b99f1258e3..f9b1e2ca95 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -189,7 +189,6 @@ select.selectpicker + .dropdown-toggle::after { } div.warning { - color: #e15563; margin: 5px; text-align: center; } From cafcba70a88401fc110556b45c2ae45b9dd7362f Mon Sep 17 00:00:00 2001 From: Aweys Ahmed Date: Tue, 2 Jul 2024 12:51:18 -0400 Subject: [PATCH 2/2] updated message to indicate low priority of message --- app/assets/stylesheets/application.scss | 2 +- app/views/distributions/_distribution_row.html.erb | 2 +- app/views/distributions/show.html.erb | 2 +- app/views/donations/show.html.erb | 2 +- app/views/purchases/show.html.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 4a23639502..d2ee0e734a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -188,7 +188,7 @@ select.selectpicker + .dropdown-toggle::after { background-color: #8282df } -div.warning { +div.low_priority_warning { margin: 5px; text-align: center; } diff --git a/app/views/distributions/_distribution_row.html.erb b/app/views/distributions/_distribution_row.html.erb index 71fc0736a9..6e1c99ee7b 100644 --- a/app/views/distributions/_distribution_row.html.erb +++ b/app/views/distributions/_distribution_row.html.erb @@ -32,6 +32,6 @@ text: "Reclaim", icon: "undo", enabled: !distribution_row.has_inactive_item? } %> <% if distribution_row.has_inactive_item? %> -
Has Inactive Items
+
Has Inactive Items
<% end %> diff --git a/app/views/distributions/show.html.erb b/app/views/distributions/show.html.erb index da6776ff12..b37af4a02e 100644 --- a/app/views/distributions/show.html.erb +++ b/app/views/distributions/show.html.erb @@ -92,7 +92,7 @@ <%= print_button_to print_distribution_path(@distribution, format: :pdf), {size: "md"} %> <% if @distribution.has_inactive_item? %> -
+
You can only correct distributions where all the items are active. If you need to make a correction, please make the following items active: <%= @distribution.inactive_items.map(&:name).join(", ") %>
diff --git a/app/views/donations/show.html.erb b/app/views/donations/show.html.erb index 8e45413ae2..fcc6ff1df9 100644 --- a/app/views/donations/show.html.erb +++ b/app/views/donations/show.html.erb @@ -82,7 +82,7 @@ confirm: "Are you sure you want to permanently remove this donation?" } %> <% end %> <% if @donation.has_inactive_item? %> -
+
You can only delete or correct donations where all the items are active. If you need to delete this donation or make a correction, please make the following items active: <%= @donation.inactive_items.map(&:name).join(", ") %>
diff --git a/app/views/purchases/show.html.erb b/app/views/purchases/show.html.erb index b4be293459..d75fb18684 100644 --- a/app/views/purchases/show.html.erb +++ b/app/views/purchases/show.html.erb @@ -77,7 +77,7 @@ confirm: "Are you sure you want to permanently remove this purchase?" } %> <% end %> <% if @purchase.has_inactive_item? %> -
+
You can only delete or correct purchases where all the items are active. If you need to delete this purchase or make a correction, please make the following items active: <%= @purchase.inactive_items.map(&:name).join(", ") %>