From 6f4c460cff186fc1c227c3ebaa73254ac186f6d5 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 18 Aug 2015 16:07:58 -0700 Subject: [PATCH] fixes #2487: Blacklist re-enable/disable all access for inline lists --- app/assets/javascripts/blacklists.js | 2 +- app/assets/stylesheets/specific/posts.css.scss | 9 +++------ .../posts/partials/common/_inline_blacklist.html.erb | 2 ++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/blacklists.js index 2cd31b444..5a6a9cd15 100644 --- a/app/assets/javascripts/blacklists.js +++ b/app/assets/javascripts/blacklists.js @@ -62,9 +62,9 @@ var hash = entry.tags.hash(); link.text(entry.tags); - link.addClass("blacklist-toggle"); link.click(Danbooru.Blacklist.toggle_entry); count.html(entry.hits); + count.addClass("count"); item.append(link); item.append(" "); item.append(count); diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index f452d736d..901f2f6f8 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -48,12 +48,8 @@ article.post-preview { margin-top: 1em; } -a.blacklist-toggle { - text-decoration: line-through; -} - a.blacklisted-active { - text-decoration: none; + text-decoration: line-through; } .post-preview.blacklisted-active, #image-container.blacklisted-active { @@ -525,8 +521,9 @@ div#c-explore-posts, div#c-post-appeals, div#c-post-flags, div#c-pools, div#c-no cursor: pointer; } - span { + span.count { color: #AAA; + margin-left: 0; } } } diff --git a/app/views/posts/partials/common/_inline_blacklist.html.erb b/app/views/posts/partials/common/_inline_blacklist.html.erb index 57c9fef12..2017ff350 100644 --- a/app/views/posts/partials/common/_inline_blacklist.html.erb +++ b/app/views/posts/partials/common/_inline_blacklist.html.erb @@ -1,5 +1,7 @@
Blacklisted: