From 75fdaa496ead9947f0b4c9059d121330e34003a5 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 7 May 2013 01:40:15 -0700 Subject: [PATCH 1/6] Revert "fixes #1438" This reverts commit 1d0c77dc7c4fd6614cf5c8232cdd16254ab4ec09. --- app/models/artist_url.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/artist_url.rb b/app/models/artist_url.rb index e166798da..834b0921b 100644 --- a/app/models/artist_url.rb +++ b/app/models/artist_url.rb @@ -11,8 +11,8 @@ class ArtistUrl < ActiveRecord::Base url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog.fc2") - url = url.gsub(/^http:\/\/img\d+\.pixiv\.net\/img/, "http://img.pixiv.net") - url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+\/img/, "http://img.pixiv.net") + url = url.gsub(/^http:\/\/img\d+\.pixiv\.net/, "http://img.pixiv.net") + url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+/, "http://img.pixiv.net") url = url.gsub(/\/+\Z/, "") url + "/" end @@ -27,8 +27,8 @@ class ArtistUrl < ActiveRecord::Base url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog*.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog*.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog*.fc2") - url = url.gsub(/^http:\/\/img\d+\.pixiv\.net\/img/, "http://img*.pixiv.net") - url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+\/img/, "http://*.pixiv.net/img*") + url = url.gsub(/^http:\/\/img\d+\.pixiv\.net/, "http://img*.pixiv.net") + url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+/, "http://*.pixiv.net/img*") end def normalize From 4878b692ad3c05f5916fa554e9b8f5189a2f235b Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 7 May 2013 01:40:40 -0700 Subject: [PATCH 2/6] update version --- config/danbooru_default_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index fb4a22fdf..e13148345 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -4,7 +4,7 @@ module Danbooru class Configuration # The version of this Danbooru. def version - "2.9.0" + "2.9.1" end # The name of this Danbooru. From 00e21ddd98870ff292da6913f5b2030c984fce8f Mon Sep 17 00:00:00 2001 From: Toks Date: Tue, 7 May 2013 07:41:47 -0400 Subject: [PATCH 3/6] fixes #1562 --- app/presenters/post_presenter.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index 8c50b20cc..9bdac970f 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -194,7 +194,11 @@ class PostPresenter < Presenter klass = "" end - pool_html << template.link_to("«".html_safe, template.post_path(pool.post_id_array.first, :pool_id => pool.id), :class => "#{klass} first") + if @post.id != pool.post_id_array.first + pool_html << template.link_to("«".html_safe, template.post_path(pool.post_id_array.first, :pool_id => pool.id), :class => "#{klass} first") + else + pool_html << '«' + end if pool.neighbors(@post).previous pool_html << template.link_to("‹ prev".html_safe, template.post_path(pool.neighbors(@post).previous, :pool_id => pool.id), :rel => prev_rel, :class => "#{klass} prev") @@ -214,7 +218,11 @@ class PostPresenter < Presenter pool_html << 'next ›' end - pool_html << template.link_to("»".html_safe, template.post_path(pool.post_id_array.last, :pool_id => pool.id), :class => "#{klass} last") + if @post.id != pool.post_id_array.last + pool_html << template.link_to("»".html_safe, template.post_path(pool.post_id_array.last, :pool_id => pool.id), :class => "#{klass} last") + else + pool_html << '»' + end pool_html << "" pool_html From f123fa55cc73a1b4b1f2b25e470e177a7b8695b6 Mon Sep 17 00:00:00 2001 From: Lightforger Date: Tue, 7 May 2013 17:14:13 +0300 Subject: [PATCH 4/6] minor css fix the elements inside already have a margin-bottom --- app/assets/stylesheets/specific/posts.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index d4295c999..8c67e1b0c 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -153,7 +153,7 @@ div#c-posts { } div.nav-notice { - padding: 0.5em; + padding: 0.5em 0.5em 0; margin-bottom: 1em; background: #EEE; border: 1px solid #AAA; From 2ad3ab3e097b63d7ebe7cc1c8603ca029e174a7e Mon Sep 17 00:00:00 2001 From: Lightforger Date: Tue, 7 May 2013 18:43:09 +0300 Subject: [PATCH 5/6] fixes #1095 --- .../stylesheets/specific/comments.css.scss | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/specific/comments.css.scss b/app/assets/stylesheets/specific/comments.css.scss index c2c0938d0..67239eedd 100644 --- a/app/assets/stylesheets/specific/comments.css.scss +++ b/app/assets/stylesheets/specific/comments.css.scss @@ -1,7 +1,6 @@ @import "../common/000_vars.css.scss"; div.comments-for-post { - float: left; div.notices { margin: 1em 0; } @@ -21,7 +20,7 @@ div.comments-for-post { width: 12em; float: left; overflow: hidden; - margin-right: 2em; + margin-right: 1em; h1 { display: block; @@ -30,8 +29,8 @@ div.comments-for-post { } div.content { - width: 40em; - float: left; + margin-left: 13em; + min-width: 17em; menu { li { @@ -61,6 +60,12 @@ div.comments-for-post { } } +div#c-posts { + div.comments-for-post { + float: left; + } +} + div#c-comments { div#a-index, div#a-show { div.header { @@ -96,8 +101,21 @@ div#c-comments { margin-bottom: 4em; div.comments-for-post { - float: left; - width: 55em; + margin-left: 184px; + min-width: 30em; + + div.list-of-comments { + float: left; + width: 100%; + } + } + } + + div.comments-for-post { + div.post { + article.comment { + margin-left: 184px; + } } } From a94a743a5eacf3cb44f6935120d3ee8b333e201c Mon Sep 17 00:00:00 2001 From: Lightforger Date: Tue, 7 May 2013 19:43:27 +0300 Subject: [PATCH 6/6] css fix, #1562 --- app/assets/stylesheets/specific/posts.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index 8c67e1b0c..d838ab72d 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -267,7 +267,7 @@ div#c-posts { li { position: relative; text-align: center; - padding: 0px 4.5em; + padding: 0px 5.5em; .prev { position: absolute;