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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 75c901660c1ee3e23cd94b51846d0c716ef7c3e0..00b2be4d7d985f73ea9e782741013078dd32a732 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1255,13 +1255,6 @@ dl.dl-inline {
   }
 }
 
-/* Rules for OpenID logo */
-
-.openid_logo {
-  vertical-align: text-bottom;
-  border: 0;
-}
-
 /* Rules for rich text */
 
 .richtext,

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 1064e95c7dd7b4bed74a6075b002be28223451aa..c8a80588ca6a830ddb9b1b9c48c6cfc4b02461f0 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -53,7 +53,7 @@ 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 = {})

diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index cb7125cca157cc3ed96e9f7e0dfaeab78690c60a..044f71681f2ec9ef2432bcc98c25dd00ecb3acfc 100644 (file)
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -111,7 +111,7 @@ class UserHelperTest < ActionView::TestCase
 
   def test_openid_logo
     logo = openid_logo
-    assert_match %r{^<img .* class="openid_logo" src="/images/openid_small.png" />$}, logo
+    assert_match %r{^<img .* src="/images/openid_small.png" />$}, logo
   end
 
   def test_auth_button