From 7aa2a41798e89ebe0eddf115cf9e060131a094db Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 14 Aug 2018 14:20:20 -0500 Subject: [PATCH] blacklists: fix flickering of inline blacklists. --- app/javascript/src/javascripts/blacklists.js | 2 -- app/javascript/src/styles/specific/posts.scss | 10 ++++++---- .../posts/partials/common/_inline_blacklist.html.erb | 4 ++-- app/views/posts/partials/index/_blacklist.html.erb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/javascript/src/javascripts/blacklists.js b/app/javascript/src/javascripts/blacklists.js index 9fbd08727..2c8fcd509 100644 --- a/app/javascript/src/javascripts/blacklists.js +++ b/app/javascript/src/javascripts/blacklists.js @@ -186,8 +186,6 @@ Blacklist.initialize_all = function() { if (Blacklist.apply() > 0) { Blacklist.update_sidebar(); Blacklist.initialize_disable_all_blacklists(); - } else { - $("#blacklist-box").hide(); } } diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss index 80c636aeb..cb905cb0e 100644 --- a/app/javascript/src/styles/specific/posts.scss +++ b/app/javascript/src/styles/specific/posts.scss @@ -499,10 +499,12 @@ div#c-explore-posts { } } -.inline-blacklist { - #blacklist-box { - margin-bottom: 1em; - } +#blacklist-box { + display: none; +} + +#blacklist-box.inline-blacklist { + margin-bottom: 1em; #blacklist-list { display: inline; diff --git a/app/views/posts/partials/common/_inline_blacklist.html.erb b/app/views/posts/partials/common/_inline_blacklist.html.erb index 909e34df0..00615ea2f 100644 --- a/app/views/posts/partials/common/_inline_blacklist.html.erb +++ b/app/views/posts/partials/common/_inline_blacklist.html.erb @@ -1,7 +1,7 @@ -
+
Blacklisted:
-
+ diff --git a/app/views/posts/partials/index/_blacklist.html.erb b/app/views/posts/partials/index/_blacklist.html.erb index 1ad6fdeaa..979d49849 100644 --- a/app/views/posts/partials/index/_blacklist.html.erb +++ b/app/views/posts/partials/index/_blacklist.html.erb @@ -1,4 +1,4 @@ -