diff --git a/app/javascript/src/styles/base/040_colors.css b/app/javascript/src/styles/base/040_colors.css index 6d32823ae..227c173bf 100644 --- a/app/javascript/src/styles/base/040_colors.css +++ b/app/javascript/src/styles/base/040_colors.css @@ -107,7 +107,6 @@ --post-flagged-notice-background: var(--error-background-color); --post-banned-notice-background: var(--error-background-color); --post-deleted-notice-background: var(--error-background-color); - --post-appealed-notice-background: #D8F2FC; --post-resized-notice-background: #EED8FC; --post-search-notice-background: #EEE; @@ -386,7 +385,6 @@ body[data-current-user-theme="dark"] { --post-flagged-notice-background: var(--red-0); --post-deleted-notice-background: var(--red-0); --post-banned-notice-background: var(--red-0); - --post-appealed-notice-background: var(--blue-0); --post-tooltip-background-color: var(--grey-3); --post-tooltip-border-color: var(--grey-4); diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss index 22962fc86..2312b8476 100644 --- a/app/javascript/src/styles/specific/posts.scss +++ b/app/javascript/src/styles/specific/posts.scss @@ -269,7 +269,6 @@ div#c-posts { &.post-notice-flagged { background: var(--post-flagged-notice-background); } &.post-notice-banned { background: var(--post-banned-notice-background); } &.post-notice-deleted { background: var(--post-deleted-notice-background); } - &.post-notice-appealed { background: var(--post-appealed-notice-background); } &.post-notice-resized { background: var(--post-resized-notice-background); } &.post-notice-search { background: var(--post-search-notice-background); } } diff --git a/app/views/modqueue/_post.html.erb b/app/views/modqueue/_post.html.erb index ce523b029..e90967391 100644 --- a/app/views/modqueue/_post.html.erb +++ b/app/views/modqueue/_post.html.erb @@ -68,10 +68,10 @@ <% end %> - <% if (post.is_flagged? || post.is_deleted?) && post.appeals.any? %> + <% if post.is_appealed? %> Appeals - <%= render "post_appeals/reasons", appeals: post.appeals %> + <%= render "post_appeals/reasons", appeal: post.appeals.select(&:pending?).last %> <% end %> diff --git a/app/views/post_appeals/_reasons.html.erb b/app/views/post_appeals/_reasons.html.erb index b5430b2d7..9e6fb87a1 100644 --- a/app/views/post_appeals/_reasons.html.erb +++ b/app/views/post_appeals/_reasons.html.erb @@ -1,9 +1,11 @@ -
This post was deleted for the following reasons:
@@ -38,6 +38,7 @@ This post was flagged and is pending approval (<%= link_to_wiki "learn more", "about:mod_queue" %>) <% elsif post.is_appealed? %> This post was appealed and is pending approval (<%= link_to_wiki "learn more", "about:mod_queue" %>) + <%= render "post_appeals/reasons", appeal: post.appeals.select(&:pending?).last %> <% end %> <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %> @@ -49,14 +50,6 @@This post was appealed:
- <%= render "post_appeals/reasons", appeals: post.appeals %> -