diff --git a/app/assets/stylesheets/specific/comments.css.scss b/app/assets/stylesheets/specific/comments.css.scss index c7c793c4e..9a16ffa7f 100644 --- a/app/assets/stylesheets/specific/comments.css.scss +++ b/app/assets/stylesheets/specific/comments.css.scss @@ -18,7 +18,7 @@ div.comments-for-post { div.content { margin-left: 2em; - width: 30em; + width: 35em; float: left; menu { diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb index bbacb0e48..c987478cf 100644 --- a/lib/danbooru/paginator/active_record_extension.rb +++ b/lib/danbooru/paginator/active_record_extension.rb @@ -67,7 +67,7 @@ module Danbooru end def records_per_page - (@paginator_options[:limit] || Danbooru.config.posts_per_page).to_i + (@paginator_options.try(:[], :limit) || Danbooru.config.posts_per_page).to_i end # taken from kaminari (https://github.com/amatsuda/kaminari)