Merge remote-tracking branch 'upstream/pull/4153'
This commit is contained in:
commit
09ce3d6abb
3 changed files with 2 additions and 9 deletions
|
@ -1255,13 +1255,6 @@ dl.dl-inline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Rules for OpenID logo */
|
|
||||||
|
|
||||||
.openid_logo {
|
|
||||||
vertical-align: text-bottom;
|
|
||||||
border: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Rules for rich text */
|
/* Rules for rich text */
|
||||||
|
|
||||||
.richtext,
|
.richtext,
|
||||||
|
|
|
@ -53,7 +53,7 @@ module UserHelper
|
||||||
# External authentication support
|
# External authentication support
|
||||||
|
|
||||||
def openid_logo
|
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
|
end
|
||||||
|
|
||||||
def auth_button(name, provider, options = {})
|
def auth_button(name, provider, options = {})
|
||||||
|
|
|
@ -111,7 +111,7 @@ class UserHelperTest < ActionView::TestCase
|
||||||
|
|
||||||
def test_openid_logo
|
def test_openid_logo
|
||||||
logo = 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
|
end
|
||||||
|
|
||||||
def test_auth_button
|
def test_auth_button
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue