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-06 17:47:35 -07:00
parent a0e6b20dd0 507717c407
commit 7b351982d9
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,12 +179,6 @@ div#c-posts {
} }
div#a-index { div#a-index {
/*
#content.with-ads {
margin-right: 6.5em;
}
*/
div#jlist-rss-ads-for-show { div#jlist-rss-ads-for-show {
float: right; float: right;
position: absolute; position: absolute;
@@ -240,10 +234,6 @@ div#c-posts {
word-wrap: break-word; word-wrap: break-word;
} }
#content.with-ads {
margin-right: 7em;
}
#favlist { #favlist {
margin-left: 1em; margin-left: 1em;
word-wrap: break-word; word-wrap: break-word;

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

@@ -15,7 +15,7 @@
<%= render "posts/partials/index/related" %> <%= render "posts/partials/index/related" %>
</aside> </aside>
<section id="content" class="<%= Danbooru.config.can_see_ads?(CurrentUser.user) ? "with-ads" : "without-ads" %>"> <section id="content">
<menu id="post-sections"> <menu id="post-sections">
<li class="active"><a href="#" id="show-posts-link">Posts</a></li> <li class="active"><a href="#" id="show-posts-link">Posts</a></li>

2
app/views/posts/show.html.erb
View File

@@ -35,7 +35,7 @@
</aside> </aside>
<section id="content" class="<%= Danbooru.config.can_see_ads?(CurrentUser.user) ? "with-ads" : "without-ads" %>"> <section id="content">
<% if @post.presenter.has_nav_links?(self) %> <% if @post.presenter.has_nav_links?(self) %>
<%= render "posts/partials/show/nav_links", :post => @post, :position => "top" %> <%= render "posts/partials/show/nav_links", :post => @post, :position => "top" %>
<% end %> <% end %>