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 3554980b84fc37fa53e7f23f797c2a401f364455..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 border border-grey"
+    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 border border-grey"
+    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 border border-grey"
+    options[:class] ||= "user_thumbnail_tiny border border-secondary-subtle"

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


@@ -58,7 +58,10 @@ module UserHelper
 
   def auth_button(name, provider, options = {})
     link_to(
 
   def auth_button(name, provider, options = {})
     link_to(

-      image_tag("#{name}.svg", :alt => t("sessions.new.auth_providers.#{name}.alt"), :class => "rounded-3"),
+      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",