From: mxdanger <32040254+mxdanger@users.noreply.github.com>
Date: Sat, 14 Nov 2020 04:02:00 +0000 (-0800)
Subject: Add updated authentication logos
X-Git-Tag: live~1843^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aad1c1b93398a85559d3987350fa16f9dc0acea0?ds=sidebyside

Add updated authentication logos
---

diff --git a/app/assets/images/aol.png b/app/assets/images/aol.png
deleted file mode 100644
index cf773f907..000000000
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 000000000..53c4dadb7
--- /dev/null
+++ b/app/assets/images/aol.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#231f20;}.b{fill:#fff;}</style></defs><rect class="a" width="36" height="36"/><path class="b" d="M19.15,19.33a1.73,1.73,0,1,0,1.72-1.83,1.76,1.76,0,0,0-1.72,1.83Zm9,3.64H26V13.33h2.18Zm3.44-11.45.73-2.32L27.7,7.75,24.5,17.94a4.25,4.25,0,0,1,.25,1.39,3.77,3.77,0,0,1-3.88,3.84,3.79,3.79,0,0,1-2.43-.8l-.62,2.69L22,26l-.78,2.47,4.61,1.45,1.44-4.6,4.09.49.37-3.13a1.46,1.46,0,0,1-2.39-1.11,1.45,1.45,0,0,1,2.62-.85l1.08-9Zm-20.5,8.1h2l-1-3.36Zm9.79-4.14a3.69,3.69,0,0,1,3.57,2.32l2.22-9.7L22,7l-.41,1.8-.86-.56-5.42,8.3,1.79-5.69L12.44,9.42l-1.23,3.91h1.85L16.82,23h-2.6l-.47-1.4H10.41L9.9,23H7.32l3.21-8.14,2.28-8.65L8.14,5,3,24.46l4.35,1.15-1.26,4,4.61,1.45,1.7-5.39,1.88,1.23,3.44-5.27A4.07,4.07,0,0,1,17,19.33a3.77,3.77,0,0,1,3.87-3.85"/></svg>
\ 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 8a9efc970..000000000
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 000000000..1968745b2
--- /dev/null
+++ b/app/assets/images/facebook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#1877f2;}.b{fill:#fff;}</style></defs><rect class="a" width="36" height="36"/><path class="b" d="M25,23.2,25.8,18h-5V14.62a2.61,2.61,0,0,1,2.94-2.81H26V7.38A27.8,27.8,0,0,0,22,7c-4.12,0-6.8,2.49-6.8,7v4H10.62v5.2h4.57V36h5.62V23.2Z"/></svg>
\ 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 b797e243a..000000000
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 000000000..79fa0cb13
--- /dev/null
+++ b/app/assets/images/github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#191717;}.b{fill:#fff;fill-rule:evenodd;}</style></defs><rect class="a" width="36" height="36"/><path class="b" d="M18,4a14,14,0,0,0-4.41,27.23c.7.13.93-.3.93-.66V28.23c-3.88.85-4.66-1.86-4.66-1.86a3.78,3.78,0,0,0-1.57-2.05c-1.26-.87.11-.85.11-.85a2.92,2.92,0,0,1,2.13,1.45,3,3,0,0,0,4,1.17h0a3,3,0,0,1,.89-1.87c-3.11-.35-6.37-1.55-6.37-6.91a5.43,5.43,0,0,1,1.43-3.72,5.06,5.06,0,0,1,.14-3.73s1.17-.37,3.85,1.43a13.2,13.2,0,0,1,7,0c2.67-1.85,3.85-1.46,3.85-1.46a5.09,5.09,0,0,1,.14,3.74,5.44,5.44,0,0,1,1.44,3.72c0,5.36-3.28,6.52-6.38,6.89a3.37,3.37,0,0,1,.94,2.56v3.83c0,.45.26.81.93.67A14,14,0,0,0,18,4Z"/></svg>
\ 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 b273b6b6e..000000000
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 000000000..fecdd4d00
--- /dev/null
+++ b/app/assets/images/google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#fff;}.b{fill:#4285f4;}.b,.c,.d,.e{fill-rule:evenodd;}.c{fill:#34a853;}.d{fill:#fbbc05;}.e{fill:#ea4335;}.f{fill:none;}</style></defs><rect class="a" width="36" height="36"/><path class="b" d="M31.44,18.31a16.07,16.07,0,0,0-.26-2.85H18v5.41h7.54a6.44,6.44,0,0,1-2.8,4.22v3.5h4.52A13.63,13.63,0,0,0,31.44,18.3Z"/><path class="c" d="M18,32a13.28,13.28,0,0,0,9.26-3.4l-4.52-3.5a8.42,8.42,0,0,1-11.65-2.51,8.28,8.28,0,0,1-.92-1.92H5.51V24.3A14,14,0,0,0,18,32Z"/><path class="d" d="M10.17,20.66a8.22,8.22,0,0,1,0-5.32V11.71H5.5a14.06,14.06,0,0,0,0,12.58Z"/><path class="e" d="M18,9.56a7.63,7.63,0,0,1,5.36,2.1l4-4A13.45,13.45,0,0,0,18,4,14,14,0,0,0,5.49,11.71l4.67,3.63A8.33,8.33,0,0,1,18,9.51Z"/><path class="f" d="M4,4H32V32H4Z"/></svg>
\ 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 784c18477..000000000
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 000000000..7330ec7e3
--- /dev/null
+++ b/app/assets/images/wikipedia.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#fff;}.b{fill-rule:evenodd;}</style></defs><rect class="a" width="36" height="36"/><path class="b" d="M33,8.82a.47.47,0,0,1-.1.3.31.31,0,0,1-.22.13,2.81,2.81,0,0,0-1.62.63,5.89,5.89,0,0,0-1.29,2.06L23,27.28c0,.15-.17.22-.37.22a.41.41,0,0,1-.38-.22l-3.82-8-4.39,8a.41.41,0,0,1-.37.22.37.37,0,0,1-.39-.22L6.55,11.94a5.41,5.41,0,0,0-1.32-2,3.6,3.6,0,0,0-1.93-.7.27.27,0,0,1-.21-.12A.38.38,0,0,1,3,8.88c0-.25.07-.38.21-.38.6,0,1.22,0,1.87.08s1.18.08,1.71.08,1.19,0,1.93-.08,1.45-.08,2-.08c.14,0,.21.13.21.38s0,.37-.13.37a2.71,2.71,0,0,0-1.41.45,1.22,1.22,0,0,0-.51,1,2.11,2.11,0,0,0,.21.8L14.67,24l3.14-5.93-2.93-6.13a7.84,7.84,0,0,0-1.29-2.11,2.56,2.56,0,0,0-1.54-.58.24.24,0,0,1-.18-.12.44.44,0,0,1-.08-.25c0-.25.06-.38.18-.38a16.22,16.22,0,0,1,1.64.08,12.58,12.58,0,0,0,1.54.08,16.71,16.71,0,0,0,1.69-.08c.62-.05,1.22-.08,1.82-.08.14,0,.21.13.21.38s0,.37-.13.37c-1.19.08-1.79.42-1.79,1a3.21,3.21,0,0,0,.42,1.24l1.93,3.93,1.92-3.59a2.88,2.88,0,0,0,.41-1.28c0-.82-.6-1.26-1.79-1.31-.11,0-.16-.13-.16-.37a.48.48,0,0,1,.07-.26c.06-.08.11-.12.17-.12.42,0,.95,0,1.57.08s1.09.08,1.47.08.68,0,1.21-.07,1.25-.09,1.7-.09c.11,0,.16.11.16.32s-.1.43-.29.43a3.35,3.35,0,0,0-1.68.57,7.38,7.38,0,0,0-1.58,2.12l-2.56,4.75,3.47,7.07,5.12-11.92a3.2,3.2,0,0,0,.27-1.2c0-.87-.6-1.34-1.79-1.39-.11,0-.16-.13-.16-.37s.08-.38.24-.38c.44,0,.95,0,1.55.08A12.92,12.92,0,0,0,30,8.66a11.78,11.78,0,0,0,1.36-.08c.54-.05,1-.08,1.44-.08C32.94,8.5,33,8.61,33,8.82Z"/></svg>
\ 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 8df253c2b..000000000
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 000000000..fdc0cbd76
--- /dev/null
+++ b/app/assets/images/windowslive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#575352;}.b{fill:#f25022;}.c{fill:#7fba00;}.d{fill:#00a4ef;}.e{fill:#ffb900;}</style></defs><rect class="a" width="36" height="36"/><rect class="b" x="4" y="3.99" width="13.31" height="13.31"/><rect class="c" x="18.69" y="3.99" width="13.31" height="13.31"/><rect class="d" x="4" y="18.69" width="13.31" height="13.3"/><rect class="e" x="18.69" y="18.69" width="13.31" height="13.3"/></svg>
\ 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 dd7147c74..000000000
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 000000000..d4ff7f03d
--- /dev/null
+++ b/app/assets/images/wordpress.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#32373c;}.b{fill:#fff;}</style></defs><rect class="a" width="36" height="36"/><path class="b" d="M6,18a12,12,0,0,0,6.76,10.8L7,13.12A11.89,11.89,0,0,0,6,18Zm20.09-.6a6.38,6.38,0,0,0-1-3.32,5.48,5.48,0,0,1-1.21-2.8,2.08,2.08,0,0,1,2-2.13h.16A12,12,0,0,0,9.16,9.9,12.18,12.18,0,0,0,8,11.41h.76c1.26,0,3.2-.16,3.2-.16a.49.49,0,0,1,.39.59.48.48,0,0,1-.32.37s-.65.08-1.37.12l4.37,13,2.63-7.88-1.88-5.11a7.37,7.37,0,0,1-1.25-.12.5.5,0,0,1-.3-.64.52.52,0,0,1,.38-.32s2,.16,3.15.16,3.2-.13,3.2-.13a.5.5,0,0,1,.39.59.48.48,0,0,1-.32.37s-.64.08-1.37.12L24,25.26l1.23-3.93A14,14,0,0,0,26.1,17.4Zm-7.89,1.65-3.6,10.47a12,12,0,0,0,7.37-.2l-.09-.16Zm10.34-6.81a10.32,10.32,0,0,1,.08,1.24,11.35,11.35,0,0,1-.91,4.3L24.05,28.34A12,12,0,0,0,28.55,12.24Z"/><path class="b" d="M32.49,18A14.49,14.49,0,1,1,18,3.51,14.49,14.49,0,0,1,32.49,18ZM18,4.38A13.62,13.62,0,1,0,31.62,18h0A13.62,13.62,0,0,0,18,4.38Z"/></svg>
\ 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 2a9c4a4f3..000000000
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 000000000..b0bbdef73
--- /dev/null
+++ b/app/assets/images/yahoo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#6001d2;}.b{fill:#fff;fill-rule:evenodd;}</style></defs><rect class="a" width="36" height="36"/><path class="b" d="M16.55,12.38l-3,7.22-3-7.22h-5l5.53,12.4-2,4.47H14l7.36-16.87ZM22.37,19a3,3,0,0,0-3.12,2.9,2.89,2.89,0,0,0,3,2.8,3,3,0,0,0,3.12-2.9,2.87,2.87,0,0,0-3-2.8M25.86,6.85,20.93,17.91h5.51L31.37,6.85Z"/></svg>
\ No newline at end of file
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 8aee535af..2fa00d009 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,15 @@ 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;
+  }
+
+  li a img {
+    border-radius: 4px;
+  }
 }
 
 /* Rules for the account confirmation page */
diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 74f16380c..a3d4bfb57 100644
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -58,7 +58,7 @@ module UserHelper
 
   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")),
       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 c2b54c056..5bee6d0c8 100644
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -73,10 +73,10 @@ class UserHelperTest < ActionView::TestCase
 
   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\" 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\" src=\"/images/yahoo.svg\" /></a>", button)
   end
 
   private