X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/46875fdde3ecdc37bb69e892b15509132a3bf9cf..108984f04af55561898a6ae3dbb42cf0bef81674:/app/helpers/user_helper.rb diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index a6161fa43..cf2d40da5 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -2,7 +2,7 @@ module UserHelper # User images def user_image(user, options = {}) - options[:class] ||= "user_image border border-grey" + options[:class] ||= "user_image border border-secondary-subtle" options[:alt] ||= "" if user.image_use_gravatar @@ -15,7 +15,7 @@ module UserHelper end def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail border border-grey" + options[:class] ||= "user_thumbnail border border-secondary-subtle" options[:alt] ||= "" if user.image_use_gravatar @@ -28,7 +28,7 @@ module UserHelper end def user_thumbnail_tiny(user, options = {}) - options[:class] ||= "user_thumbnail_tiny border border-grey" + options[:class] ||= "user_thumbnail_tiny border border-secondary-subtle" options[:alt] ||= "" if user.image_use_gravatar @@ -53,12 +53,15 @@ module UserHelper # External authentication support def openid_logo - image_tag "openid_small.png", :alt => t("sessions.new.openid_logo_alt"), :class => "openid_logo" + image_tag "openid_small.png", :alt => t("sessions.new.openid_logo_alt"), :class => "align-text-bottom" end def auth_button(name, provider, options = {}) link_to( - image_tag("#{name}.svg", :alt => t("sessions.new.auth_providers.#{name}.alt"), :class => "rounded-lg"), + image_tag("#{name}.svg", + :alt => t("sessions.new.auth_providers.#{name}.alt"), + :class => "rounded-3", + :size => "36"), auth_path(options.merge(:provider => provider)), :method => :post, :class => "auth_button", @@ -73,7 +76,7 @@ module UserHelper if user.avatar.variable? variant = user.avatar.variant(variant_options) # https://stackoverflow.com/questions/61893089/get-metadata-of-active-storage-variant/67228171 - if variant.processed? + if variant.send(:processed?) metadata = variant.processed.send(:record).image.blob.metadata if metadata["width"] options[:width] = metadata["width"]