Skip to content

Commit

Permalink
Merge pull request #4462 from AweysAhmed/4242-update-colour-for-inact…
Browse files Browse the repository at this point in the history
…ive-items-message

Fixes #4242 so that  css file doesn't make the warning message look scary
  • Loading branch information
cielf committed Jul 3, 2024
2 parents 3ca0ed9 + cafcba7 commit f0dfb02
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@ select.selectpicker + .dropdown-toggle::after {
background-color: #8282df
}

div.warning {
color: #e15563;
div.low_priority_warning {
margin: 5px;
text-align: center;
}
2 changes: 1 addition & 1 deletion app/views/distributions/_distribution_row.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
text: "Reclaim",
icon: "undo", enabled: !distribution_row.has_inactive_item? } %>
<% if distribution_row.has_inactive_item? %>
<div class="warning">Has Inactive Items</div>
<div class="low_priority_warning">Has Inactive Items</div>
<% end %>
</td>
2 changes: 1 addition & 1 deletion app/views/distributions/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<%= print_button_to print_distribution_path(@distribution, format: :pdf), {size: "md"} %>
</div>
<% if @distribution.has_inactive_item? %>
<div class="warning">
<div class="low_prioirty_warning">
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(", ") %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/donations/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
confirm: "Are you sure you want to permanently remove this donation?" } %>
<% end %>
<% if @donation.has_inactive_item? %>
<div class="warning">
<div class="low_priority_warning">
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(", ") %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/purchases/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
confirm: "Are you sure you want to permanently remove this purchase?" } %>
<% end %>
<% if @purchase.has_inactive_item? %>
<div class="warning">
<div class="low_priority_warning">
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(", ") %>
</div>
Expand Down

0 comments on commit f0dfb02

Please sign in to comment.