diff --git a/app/assets/images/aol.png b/app/assets/images/aol.png deleted file mode 100644 index cf773f9072..0000000000 Binary files a/app/assets/images/aol.png and /dev/null differ diff --git a/app/assets/images/aol.svg b/app/assets/images/aol.svg new file mode 100644 index 0000000000..53c4dadb73 --- /dev/null +++ b/app/assets/images/aol.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png deleted file mode 100644 index 8a9efc970e..0000000000 Binary files a/app/assets/images/facebook.png and /dev/null differ diff --git a/app/assets/images/facebook.svg b/app/assets/images/facebook.svg new file mode 100644 index 0000000000..1968745b2a --- /dev/null +++ b/app/assets/images/facebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/github.png b/app/assets/images/github.png deleted file mode 100644 index b797e243a7..0000000000 Binary files a/app/assets/images/github.png and /dev/null differ diff --git a/app/assets/images/github.svg b/app/assets/images/github.svg new file mode 100644 index 0000000000..79fa0cb132 --- /dev/null +++ b/app/assets/images/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/google.png b/app/assets/images/google.png deleted file mode 100644 index b273b6b6ef..0000000000 Binary files a/app/assets/images/google.png and /dev/null differ diff --git a/app/assets/images/google.svg b/app/assets/images/google.svg new file mode 100644 index 0000000000..fecdd4d003 --- /dev/null +++ b/app/assets/images/google.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/wikipedia.png b/app/assets/images/wikipedia.png deleted file mode 100644 index 784c18477b..0000000000 Binary files a/app/assets/images/wikipedia.png and /dev/null differ diff --git a/app/assets/images/wikipedia.svg b/app/assets/images/wikipedia.svg new file mode 100644 index 0000000000..7330ec7e3e --- /dev/null +++ b/app/assets/images/wikipedia.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/windowslive.png b/app/assets/images/windowslive.png deleted file mode 100644 index 8df253c2b4..0000000000 Binary files a/app/assets/images/windowslive.png and /dev/null differ diff --git a/app/assets/images/windowslive.svg b/app/assets/images/windowslive.svg new file mode 100644 index 0000000000..fdc0cbd763 --- /dev/null +++ b/app/assets/images/windowslive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/wordpress.png b/app/assets/images/wordpress.png deleted file mode 100644 index dd7147c74e..0000000000 Binary files a/app/assets/images/wordpress.png and /dev/null differ diff --git a/app/assets/images/wordpress.svg b/app/assets/images/wordpress.svg new file mode 100644 index 0000000000..d4ff7f03d0 --- /dev/null +++ b/app/assets/images/wordpress.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/yahoo.png b/app/assets/images/yahoo.png deleted file mode 100644 index 2a9c4a4f35..0000000000 Binary files a/app/assets/images/yahoo.png and /dev/null differ diff --git a/app/assets/images/yahoo.svg b/app/assets/images/yahoo.svg new file mode 100644 index 0000000000..b0bbdef738 --- /dev/null +++ b/app/assets/images/yahoo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 8aee535af1..46ef1c3497 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1324,7 +1324,7 @@ tr.turn:hover { .diary-subscribe-buttons { - position:relative; + position: relative; top: -30px; left: 130px; } @@ -1333,11 +1333,11 @@ tr.turn:hover { #login_auth_buttons { margin-bottom: 0; -} -#login_auth_buttons li { - float: left; - padding: $lineheight/4 $lineheight/2; + li { + float: left; + padding: $lineheight/4 $lineheight/2; + } } /* Rules for the account confirmation page */ diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 74f16380c2..5b33b57b33 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -58,7 +58,7 @@ def openid_logo def auth_button(name, provider, options = {}) link_to( - image_tag("#{name}.png", :alt => t("users.login.auth_providers.#{name}.alt")), + image_tag("#{name}.svg", :alt => t("users.login.auth_providers.#{name}.alt"), :class => "rounded-lg"), auth_path(options.merge(:provider => provider)), :class => "auth_button", :title => t("users.login.auth_providers.#{name}.title") diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index c2b54c0563..340d2494d4 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -73,10 +73,10 @@ def test_openid_logo def test_auth_button button = auth_button("google", "google") - assert_equal("\"Login", button) + assert_equal("\"Login", button) button = auth_button("yahoo", "openid", :openid_url => "yahoo.com") - assert_equal("\"Login", button) + assert_equal("\"Login", button) end private