From f3c977aa9d15eafeeaf524e55aaaa2bfcc101790 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 10 May 2023 02:37:01 -0700
Subject: [PATCH] Nicer button

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en/auth/general.php   |  2 +-
 resources/views/auth/login.blade.php | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/resources/lang/en/auth/general.php b/resources/lang/en/auth/general.php
index 6c1bf826f0..4486f090b2 100644
--- a/resources/lang/en/auth/general.php
+++ b/resources/lang/en/auth/general.php
@@ -12,7 +12,7 @@ return [
     'remember_me'                   => 'Remember Me',
     'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
     'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
-    'google_login'                  => 'Login via Google',
+    'google_login'                  => 'Or login with Google Workspace',
     'google_login_failed'           => 'Google Login failed, please try again.',
 
 ];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 9d1f371cf4..1e37e3acb2 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -73,33 +73,30 @@
                         </div>
                         <div class="box-footer">
                             @if (config('app.require_saml'))
-                                <a class="btn btn-lg btn-primary btn-block" href="{{ route('saml.login')  }}">{{ trans('auth/general.saml_login')  }}</a>
+                                <a class="btn btn-primary btn-block" href="{{ route('saml.login')  }}">{{ trans('auth/general.saml_login')  }}</a>
                             @else
-                                <button class="btn btn-lg btn-primary btn-block">{{ trans('auth/general.login')  }}</button>
+                                <button class="btn btn-primary btn-block">{{ trans('auth/general.login')  }}</button>
                             @endif
 
-                            @if (($snipeSettings->google_login=='1') && ($snipeSettings->google_client_id!='') && ($snipeSettings->google_client_secret!=''))
-
-                            <br>
-                            <center>Or</center>
-                            <br>
-                                <a class="btn btn-lg btn-primary btn-block" href="{{ route('google.redirect')  }}">
-                                    <i class="fa-brands fa-google"></i>
-                                    {{ trans('auth/general.google_login') }}
-                                </a>
-                            @endif
                         </div>
-                        <div class="text-right col-md-12 col-sm-12 col-xs-12" style="padding-top: 10px;">
+                        <div class="text-right col-md-12 col-sm-12 col-xs-12" style="padding-top: 10px; padding-bottom: 10px">
                             @if ($snipeSettings->custom_forgot_pass_url)
                                 <a href="{{ $snipeSettings->custom_forgot_pass_url  }}" rel="noopener">{{ trans('auth/general.forgot_password')  }}</a>
                             @elseif (!config('app.require_saml'))
                                 <a href="{{ route('password.request')  }}">{{ trans('auth/general.forgot_password')  }}</a>
                             @endif
 
-
                         </div>
+
                     </div> <!-- end login box -->
 
+                    @if (($snipeSettings->google_login=='1') && ($snipeSettings->google_client_id!='') && ($snipeSettings->google_client_secret!=''))
+
+                        <a href="{{ route('google.redirect')  }}" class="btn btn-block btn-social btn-google">
+                            <i class="fa-brands fa-google"></i> {{ trans('auth/general.google_login') }}
+                        </a>
+                    @endif
+
                 </div> <!-- col-md-4 -->
 
             </div> <!-- end row -->