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

Merge branch 'master' of github.com:r888888888/danbooru

Browse Source
This commit is contained in:
r888888888
2013-06-05 14:44:05 -07:00
parent 518c2ea52d ae52549d10
commit ffc8c6f92c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/specific/posts.css.scss
View File

@@ -321,8 +321,12 @@ div#c-explore-posts {
margin: 0 0.5em; margin: 0 0.5em;
} }
#popular-nav-links {
text-align: center;
}
.period { .period {
margin: 0 0.5em; margin: 0 5em;
&:first-child { &:first-child {
margin-left: 0; margin-left: 0;

6
app/presenters/tag_set_presenter.rb
View File

@@ -92,10 +92,6 @@ private
end end
end end
def is_index?(template)
template.params[:action] == "index"
end
def build_list_item(tag, template, options) def build_list_item(tag, template, options)
html = "" html = ""
html << %{<li class="category-#{categories[tag]}">} html << %{<li class="category-#{categories[tag]}">}
@@ -108,7 +104,7 @@ private
html << %{<a class="wiki-link" href="/wiki_pages/show_or_new?title=#{u(tag)}">?</a> } html << %{<a class="wiki-link" href="/wiki_pages/show_or_new?title=#{u(tag)}">?</a> }
end end
if CurrentUser.user.is_gold? && is_index?(template) && current_query.present? if CurrentUser.user.is_gold? && current_query.present?
html << %{<a href="/posts?tags=#{u(current_query)}+#{u(tag)}" class="search-inc-tag">+</a> } html << %{<a href="/posts?tags=#{u(current_query)}+#{u(tag)}" class="search-inc-tag">+</a> }
html << %{<a href="/posts?tags=#{u(current_query)}+-#{u(tag)}" class="search-exl-tag">&ndash;</a> } html << %{<a href="/posts?tags=#{u(current_query)}+-#{u(tag)}" class="search-exl-tag">&ndash;</a> }
end end