Merge remote-tracking branch 'upstream/pull/4656'

[rails.git] / app / helpers / user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index eed55cd9d9a722d00a56dea6a7ee5073a582430a..cf2d40da565d68caec258ae063135500aa4ea58a 100644 (file)
--- 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 = {})
   # User images
 
   def user_image(user, options = {})

-    options[:class] ||= "user_image"
+    options[:class] ||= "user_image border border-secondary-subtle"

     options[:alt] ||= ""
 
     if user.image_use_gravatar
     options[:alt] ||= ""
 
     if user.image_use_gravatar


@@ -15,7 +15,7 @@ module UserHelper
   end
 
   def user_thumbnail(user, options = {})
   end
 
   def user_thumbnail(user, options = {})

-    options[:class] ||= "user_thumbnail"
+    options[:class] ||= "user_thumbnail border border-secondary-subtle"

     options[:alt] ||= ""
 
     if user.image_use_gravatar
     options[:alt] ||= ""
 
     if user.image_use_gravatar


@@ -28,7 +28,7 @@ module UserHelper
   end
 
   def user_thumbnail_tiny(user, options = {})
   end
 
   def user_thumbnail_tiny(user, options = {})

-    options[:class] ||= "user_thumbnail_tiny"
+    options[:class] ||= "user_thumbnail_tiny border border-secondary-subtle"

     options[:alt] ||= ""
 
     if user.image_use_gravatar
     options[:alt] ||= ""
 
     if user.image_use_gravatar


@@ -53,12 +53,15 @@ module UserHelper
   # External authentication support
 
   def openid_logo
   # 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(
   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",
       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 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"]
         metadata = variant.processed.send(:record).image.blob.metadata
         if metadata["width"]
           options[:width] = metadata["width"]