From fd4c23e12d494d06d7cb963fe6f23fbd2c718bbd Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Thu, 11 Oct 2018 16:52:00 -0700
Subject: [PATCH] login: Clean up CSS/HTML for google/github login buttons.

This removes some unnecessary code duplication in the CSS classes for
Google and GitHub authentication social auth buttons.

This will, in turn, help us avoid extra work every time we add a new
authentication backend.
---
 static/styles/portico-signin.scss   | 4 ----
 static/styles/portico.scss          | 4 +---
 templates/zerver/accounts_home.html | 4 ++--
 templates/zerver/login.html         | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/static/styles/portico-signin.scss b/static/styles/portico-signin.scss
index 40f75fcba7..e999458d1b 100644
--- a/static/styles/portico-signin.scss
+++ b/static/styles/portico-signin.scss
@@ -582,10 +582,6 @@ html {
     padding: 0 5px;
 }
 
-.login-google {
-    margin-bottom: 10px;
-}
-
 button.login-social-button {
     width: 328px;
     padding-left: 35px;
diff --git a/static/styles/portico.scss b/static/styles/portico.scss
index 5ebf240956..6cdc3f2e58 100644
--- a/static/styles/portico.scss
+++ b/static/styles/portico.scss
@@ -1264,10 +1264,8 @@ input.new-organization-button {
     font-weight: 300;
 }
 
-.login-google,
-.register-google,
 .login-sso,
-.login-github {
+.login-social {
     max-width: 100%;
     min-width: 300px;
     margin: auto;
diff --git a/templates/zerver/accounts_home.html b/templates/zerver/accounts_home.html
index fe07cfc767..b45400c70f 100644
--- a/templates/zerver/accounts_home.html
+++ b/templates/zerver/accounts_home.html
@@ -76,7 +76,7 @@ $(function () {
                         {% endif %}
 
                         {% if google_auth_enabled %}
-                        <div class="register-google">
+                        <div class="login-social">
                             <form class="form-inline" action="{{ url('zerver.views.auth.start_google_oauth2') }}" method="get">
                                 <input type='hidden' name='is_signup' value='1' />
                                 <button class="login-social-button login-google-button full-width">
@@ -87,7 +87,7 @@ $(function () {
                         {% endif %}
 
                         {% if github_auth_enabled %}
-                        <div class="login-github">
+                        <div class="login-social">
                             <form class="form-inline github-wrapper" action="{{ url('signup-social', args=('github',)) }}" method="get">
                                 <button class="login-social-button login-github-button full-width">
                                     {{ _('Sign up with %(identity_provider)s', identity_provider="GitHub") }}
diff --git a/templates/zerver/login.html b/templates/zerver/login.html
index 77e9a09ef8..3016289ac3 100644
--- a/templates/zerver/login.html
+++ b/templates/zerver/login.html
@@ -133,7 +133,7 @@
                             {% endif %} <!-- if password_auth_enabled -->
 
                             {% if google_auth_enabled %}
-                            <div class="login-google">
+                            <div class="login-social">
                                 <form id='google_login_form' class="form-inline" action="{{ url('zerver.views.auth.start_google_oauth2') }}" method="get">
                                     <input type="hidden" name="next" value="{{ next }}">
                                     <button class="login-social-button login-google-button full-width">
@@ -144,7 +144,7 @@
                             {% endif %}
 
                             {% if github_auth_enabled %}
-                            <div class="login-github">
+                            <div class="login-social">
                                 <form id='social_login_form' class="form-inline github-wrapper" action="{{ url('login-social', args=('github',)) }}" method="get">
                                     <input type="hidden" name="next" value="{{ next }}">
                                     <button class="login-social-button login-github-button github">