diff --git a/Gemfile.lock b/Gemfile.lock index feba5710a..fc56688a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,9 +6,9 @@ GIT GIT remote: https://github.com/r888888888/dtext_rb.git - revision: e349031a5dcc74079d636c40243e099bde3e47d5 + revision: e2dd779f994ad8b4010ec36a92ad93ad43b2e3f1 specs: - dtext_rb (1.0.2) + dtext_rb (1.0.3) jeweler (~> 2.0) minitest (~> 5.8) rake-compiler (~> 0.9) diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss index a4892dfe0..eddf92f4c 100644 --- a/app/assets/stylesheets/specific/posts.css.scss +++ b/app/assets/stylesheets/specific/posts.css.scss @@ -60,6 +60,12 @@ a.blacklisted-active { display: none; } +#image-container p.desc { + font-size: 80%; + color: grey; + font-style: italic; +} + .post-preview { img { border: 2px solid transparent; diff --git a/app/views/posts/partials/show/_image.html.erb b/app/views/posts/partials/show/_image.html.erb index 0d7629b7a..d94030a2f 100644 --- a/app/views/posts/partials/show/_image.html.erb +++ b/app/views/posts/partials/show/_image.html.erb @@ -1,3 +1,4 @@ <% if post.visible? %> <%= image_tag(post.file_url_for(CurrentUser.user), :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image", "data-original-width" => post.image_width, "data-original-height" => post.image_height, "data-large-width" => post.large_image_width, "data-large-height" => post.large_image_height, "data-tags" => post.tag_string, :alt => post.presenter.humanized_essential_tag_string, "data-uploader" => post.uploader_name, "data-rating" => post.rating, "data-flags" => post.status_flags, "data-parent-id" => post.parent_id, "data-has-children" => post.has_children?, "data-has-active-children" => post.has_active_children?, "data-score" => post.score, "data-fav-count" => post.fav_count, "itemprop" => "contentUrl") %> +

<%= post.presenter.humanized_essential_tag_string %>

<% end %> diff --git a/app/views/posts/partials/show/_information.html.erb b/app/views/posts/partials/show/_information.html.erb index 1749f5c92..eb04d4383 100644 --- a/app/views/posts/partials/show/_information.html.erb +++ b/app/views/posts/partials/show/_information.html.erb @@ -1,4 +1,4 @@ -