jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3028 from evazion/fix-flag-borders

Browse Source 
Change flag borders from red to blue for non-approvers.
This commit is contained in:
Albert Yi
2017-05-08 13:05:54 -07:00
committed by GitHub
parent 0018a09f30 c1fa656bd2
commit 64311c83e4
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/stylesheets/specific/posts.scss
View File

@@ -102,23 +102,30 @@ a.blacklisted-active {
} }
&.post-status-pending:not(.mod-queue-preview) img { /* Pending and flagged posts have blue borders (except in the modqueue). */
&.post-status-pending:not(.mod-queue-preview) img,
&.post-status-flagged:not(.mod-queue-preview) img {
border-color: $preview_pending_color; border-color: $preview_pending_color;
} }
&.post-status-has-children.post-status-pending:not(.mod-queue-preview) img { &.post-status-has-children.post-status-pending:not(.mod-queue-preview) img,
&.post-status-has-children.post-status-flagged:not(.mod-queue-preview) img {
border-color: $preview_has_children_color $preview_pending_color $preview_pending_color $preview_has_children_color; border-color: $preview_has_children_color $preview_pending_color $preview_pending_color $preview_has_children_color;
} }
&.post-status-has-parent.post-status-pending:not(.mod-queue-preview) img { &.post-status-has-parent.post-status-pending:not(.mod-queue-preview) img,
&.post-status-has-parent.post-status-flagged:not(.mod-queue-preview) img {
border-color: $preview_has_parent_color $preview_pending_color $preview_pending_color $preview_has_parent_color; border-color: $preview_has_parent_color $preview_pending_color $preview_pending_color $preview_has_parent_color;
} }
&.post-status-has-children.post-status-has-parent.post-status-pending:not(.mod-queue-preview) img { &.post-status-has-children.post-status-has-parent.post-status-pending:not(.mod-queue-preview) img,
&.post-status-has-children.post-status-has-parent.post-status-flagged:not(.mod-queue-preview) img {
border-color: $preview_has_children_color $preview_pending_color $preview_pending_color $preview_has_parent_color; border-color: $preview_has_children_color $preview_pending_color $preview_pending_color $preview_has_parent_color;
} }
}
/* Flagged posts have red borders for approvers. */
body[data-can-approve-posts="true"] .post-preview {
&.post-status-flagged img { &.post-status-flagged img {
border-color: $preview_flagged_color; border-color: $preview_flagged_color;
} }

2
app/views/layouts/default.html.erb
View File

@@ -69,7 +69,7 @@
} }
</script> </script>
</head> </head>
<body lang="en"> <body lang="en" data-can-approve-posts="<%= CurrentUser.user.can_approve_posts? %>">
<header id="top"> <header id="top">
<%= render "news_updates/listing" %> <%= render "news_updates/listing" %>