Merge pull request #3009 from gravitystorm/svg_icons

Add updated authentication icons
openstreetmap · Dec 17, 2020 · bd1420a · bd1420a
2 parents aeb9c4d + c192bd0
commit bd1420a
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 8 deletions.
diff --git a/app/assets/images/aol.png b/app/assets/images/aol.png
diff --git a/app/assets/images/aol.svg b/app/assets/images/aol.svg
diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png
diff --git a/app/assets/images/facebook.svg b/app/assets/images/facebook.svg
diff --git a/app/assets/images/github.png b/app/assets/images/github.png
diff --git a/app/assets/images/github.svg b/app/assets/images/github.svg
diff --git a/app/assets/images/google.png b/app/assets/images/google.png
diff --git a/app/assets/images/google.svg b/app/assets/images/google.svg
diff --git a/app/assets/images/wikipedia.png b/app/assets/images/wikipedia.png
diff --git a/app/assets/images/wikipedia.svg b/app/assets/images/wikipedia.svg
diff --git a/app/assets/images/windowslive.png b/app/assets/images/windowslive.png
diff --git a/app/assets/images/windowslive.svg b/app/assets/images/windowslive.svg
diff --git a/app/assets/images/wordpress.png b/app/assets/images/wordpress.png
diff --git a/app/assets/images/wordpress.svg b/app/assets/images/wordpress.svg
diff --git a/app/assets/images/yahoo.png b/app/assets/images/yahoo.png
diff --git a/app/assets/images/yahoo.svg b/app/assets/images/yahoo.svg
diff --git 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
@@ -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
@@ -73,10 +73,10 @@ def test_openid_logo
 
   def test_auth_button
     button = auth_button("google", "google")
-    assert_equal("<a class=\"auth_button\" title=\"Login with Google\" href=\"/auth/google\"><img alt=\"Login with a Google OpenID\" src=\"/images/google.png\" /></a>", button)
+    assert_equal("<a class=\"auth_button\" title=\"Login with Google\" href=\"/auth/google\"><img alt=\"Login with a Google OpenID\" class=\"rounded-lg\" src=\"/images/google.svg\" /></a>", button)
 
     button = auth_button("yahoo", "openid", :openid_url => "yahoo.com")
-    assert_equal("<a class=\"auth_button\" title=\"Login with Yahoo\" href=\"/auth/openid?openid_url=yahoo\.com\"><img alt=\"Login with a Yahoo OpenID\" src=\"/images/yahoo.png\" /></a>", button)
+    assert_equal("<a class=\"auth_button\" title=\"Login with Yahoo\" href=\"/auth/openid?openid_url=yahoo\.com\"><img alt=\"Login with a Yahoo OpenID\" class=\"rounded-lg\" src=\"/images/yahoo.svg\" /></a>", button)
   end
 
   private