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

app/assets/stylesheets/specific/posts.css.scss

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

app/views/posts/index.html.erb

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

app/views/posts/show.html.erb

@@ -35,7 +35,7 @@
 
     </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) %>
         <%= render "posts/partials/show/nav_links", :post => @post, :position => "top" %>
       <% end %>