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

blacklists: fix flickering of inline blacklists.

Browse Source
This commit is contained in:
evazion
2018-08-14 14:20:20 -05:00
parent 33ed762e91
commit 7aa2a41798
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/src/javascripts/blacklists.js
View File

@@ -186,8 +186,6 @@ Blacklist.initialize_all = function() {
if (Blacklist.apply() > 0) { if (Blacklist.apply() > 0) {
Blacklist.update_sidebar(); Blacklist.update_sidebar();
Blacklist.initialize_disable_all_blacklists(); Blacklist.initialize_disable_all_blacklists();
} else {
$("#blacklist-box").hide();
} }
} }

10
app/javascript/src/styles/specific/posts.scss
View File

@@ -499,10 +499,12 @@ div#c-explore-posts {
} }
} }
.inline-blacklist { #blacklist-box {
#blacklist-box { display: none;
margin-bottom: 1em; }
}
#blacklist-box.inline-blacklist {
margin-bottom: 1em;
#blacklist-list { #blacklist-list {
display: inline; display: inline;

4
app/views/posts/partials/common/_inline_blacklist.html.erb
View File

@@ -1,7 +1,7 @@
<div id="blacklist-box" class="inline-blacklist"> <section id="blacklist-box" class="inline-blacklist">
<strong>Blacklisted: </strong> <strong>Blacklisted: </strong>
<ul id="blacklist-list"> <ul id="blacklist-list">
<li id="disable-all-blacklists" style="display: none;"><span class="link">Disable all</span></li> <li id="disable-all-blacklists" style="display: none;"><span class="link">Disable all</span></li>
<li id="re-enable-all-blacklists" style="display: none;"><span class="link">Re-enable all</span></li> <li id="re-enable-all-blacklists" style="display: none;"><span class="link">Re-enable all</span></li>
</ul> </ul>
</div> </section>

2
app/views/posts/partials/index/_blacklist.html.erb
View File

@@ -1,4 +1,4 @@
<section id="blacklist-box" style="display: none;"> <section id="blacklist-box">
<h1>Blacklisted (<%= link_to "Help", wiki_pages_path(:title => "help:blacklists") %>)</h1> <h1>Blacklisted (<%= link_to "Help", wiki_pages_path(:title => "help:blacklists") %>)</h1>
<ul id="blacklist-list"> <ul id="blacklist-list">
</ul> </ul>