From 63f7edd0c68f70e11d033824e9e8b37be43b43cd Mon Sep 17 00:00:00 2001 From: r888888888 Date: Wed, 6 Sep 2017 17:02:43 -0700 Subject: [PATCH] add toggle for testing cropped thumbnails --- app/assets/stylesheets/specific/z_responsive.scss | 4 ++-- app/logical/anonymous_user.rb | 4 ++++ app/models/user.rb | 1 + app/presenters/post_presenter.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/specific/z_responsive.scss b/app/assets/stylesheets/specific/z_responsive.scss index 6afaac0e5..318883348 100644 --- a/app/assets/stylesheets/specific/z_responsive.scss +++ b/app/assets/stylesheets/specific/z_responsive.scss @@ -101,13 +101,13 @@ margin: 0 auto; } img { - object-fit: cover; + object-fit: contain; width: 48.5vw; height: 48.5vw; margin: 0 auto; border: none; } - img.cropped { + img.cropped-true { object-fit: cover; } &[data-tags~=animated]:before, &[data-file-ext=swf]:before, &[data-file-ext=webm]:before, &[data-file-ext=mp4]:before, &[data-file-ext=zip]:before { diff --git a/app/logical/anonymous_user.rb b/app/logical/anonymous_user.rb index 45dee91e4..2362fa8c9 100644 --- a/app/logical/anonymous_user.rb +++ b/app/logical/anonymous_user.rb @@ -257,6 +257,10 @@ class AnonymousUser false end + def cropped_thumbnails? + false + end + User::Roles.reject {|r| r == :anonymous}.each do |name| define_method("is_#{name}?") do false diff --git a/app/models/user.rb b/app/models/user.rb index 538f54e9a..9b443d0e6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -45,6 +45,7 @@ class User < ApplicationRecord is_super_voter disable_tagged_filenames enable_recent_searches + cropped_thumbnails ) include Danbooru::HasBitFlags diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index fbe33a8ff..450fe16c7 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -32,7 +32,7 @@ class PostPresenter < Presenter tag_param = nil end html << %{} - html << %{#{h(post.tag_string)}} + html << %{#{h(post.tag_string)}} html << %{} if options[:pool]