From 7c5d29ccd9ccfe6ee8a8a19ecea1cc2ff14eeeb9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 5 Jan 2024 14:56:34 +0000
Subject: [PATCH] Move Google Login prompt higher, made it bigger

Signed-off-by: snipe <snipe@snipe.net>
---
 public/css/build/app.css              | Bin 23442 -> 23903 bytes
 public/css/build/overrides.css        | Bin 16592 -> 17053 bytes
 public/css/dist/all.css               | Bin 514716 -> 515638 bytes
 public/mix-manifest.json              |   6 +++---
 resources/assets/less/overrides.less  |  30 +++++++++++++++++++++++++-
 resources/lang/en-US/auth/general.php |   2 +-
 resources/lang/en-US/general.php      |   1 +
 resources/views/auth/login.blade.php  |  18 ++++++++++------
 8 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/public/css/build/app.css b/public/css/build/app.css
index ad6e6539cfcd55cba9abe080b384fdd32972cc39..23a455db61fbb91d9778643129efad780ced902d 100644
GIT binary patch
delta 429
zcmZvY!Ait15Qf=nz`G|I@UU8JSH&XD9=&+hqo=f;wt+M$$&}q9vd^IV9^y^#WqcKr
z>aJ8gB!_?g`Tn1Id7piL%-)_KHj5}?{=q$V!U{4L91RK`tRyu+xF(Pqs6l9DSt?B6
zrneR~sR4}kU+=Jld>Adt)ZW~Q8X@m#<QAq^evaQhR1Q}ST1*&33zoRsee5FxD5dL^
z7&uf4*Gn%5C2Ji^!q#ypd@9-?hg$JC+pF8x>%+UkC}TMsXK8korAzkY6LtZd=U5qw
zXA@0S9tk14FrKc7!+ahhLIVyL+wS0K^Dj;tI^o!MG@S0xBc~PCA0f7~ZanNfxlFPB
Q(`2&x+u&zYVKrG~UzGKZ3IG5A

delta 11
Scmcb=i*eF+#tjpr8My!<RRoLx

diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index acd302b95108d943b0819cbf8346940977c203bb..1630ba1df96fe3e20832ca5cc8c24a48eafa3846 100644
GIT binary patch
delta 417
zcmaKnF;2uV5Jk1E3q(nQ&~ytC$pRupybXeeo{r8*CW$4-j_iqcBZO8IoFFxK;3jYg
zN)EA3U>BvKu!}$czd!T&GJAWSy?@+n7D2%Lg9mJc6=W<p>J&OyNveQwO&~Q;g;2{p
zR~W%vYb|P09T@Gu)?p55H(Hb_y}1!3LfX>E%}lHO9DjVM9Ih&~7%>PIEOPhz+9w8(
zOV=pTaVQk7mtGJ`mO7M#wd0WaR<wgWtQC&4z1n{tAN61S@b=kLcTmn#ER4nTi6#n<
zfuS!mo~Vh#d_G`@Rt}f_<H5-$iIeLjUa|>J8#?7!H`JZ&&?Bc7)*l{PSymo)5naVt
P{}=t+;5VtTm;~7tq1cO4

delta 11
ScmbQ+%6OrXal?5BMlJvyiUdFa

diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index cf1f1c6ca03c807d575fb20a5e8ae90f6488df49..53e604b8a841f8fea3b7af65bdd6757e78ffbd27 100644
GIT binary patch
delta 721
zcmbQUReswZ`Gyw87N!>F7M2#)7Pc+yzeDTwwY0c^SRpvIAh9U1B)>?ZxTG>CwOFA%
zvm`^IB(<VMAu~^*BqLQJH!~$ACsj|uxwNP#HLoP6QXxMNNR$?*rYIy;f|catrvnui
zB&Me-B$bwc%}vfP%>l}%Le!<^6sMMFq!y*>aVco&bLkax!L6;HF8G>FWV+BxHu34H
z8mwZ|kBG2~>L=&t<QG{fC|jCZnpm1zbJYU%z_eIdC8eh27p3YT#HK&I#3nZVoGBX{
zds<Fvg_VNg^uX_oa_U&M=jE4ZSf%C`lvHX$jhdd=!6M>ppl4*7nu}%^isHnylGGxF
wYAywZ+{7ZFmvwVe(@Lxq5E`co#<PoT=MQ7=X&DV+j1YD~1Qb$ik`}^T0OMosGynhq

delta 36
scmdnCM}E#$`Gyw87N!>F7M2#)7Pc+yzeA@R7P5<MzZ1^h)56FF00LGG8UO$Q

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index f232c20fc6..fcc3223276 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
     "/js/build/app.js": "/js/build/app.js?id=41293fc7aa00ece89fd524e1e0e31a68",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=8453824ff928a55d685947c84e6b3079",
-    "/css/build/app.css": "/css/build/app.css?id=ddf74e5777fbad72decf760fe8e57570",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=9a69d65b9f2b35e6d17c6a72e76424d5",
+    "/css/build/app.css": "/css/build/app.css?id=5a516232bc9f1488514577cf3c8108eb",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=e6e53eef152bba01a4c666a4d8b01117",
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/all.css": "/css/dist/all.css?id=013a453127efd85087fb38c01e99a750",
+    "/css/dist/all.css": "/css/dist/all.css?id=672c12fc9cd418d80133a246b24b828d",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=69e5d8e4e818f05fd882cceb758d1eba",
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 128817a119..5e16953427 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -859,4 +859,32 @@ input[type="radio"]:checked::before {
 
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
-/** --------------------------------------- **/
\ No newline at end of file
+/** --------------------------------------- **/
+
+/**
+/** Separator styles with text in the middle. Currently only used by the login page but
+/** could be used elsewhere.
+ */
+
+.separator {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  padding-top: 20px;
+  color: #959495;
+}
+
+.separator::before,
+.separator::after {
+  content: '';
+  flex: 1;
+  border-bottom: 1px solid #959495;
+}
+
+.separator:not(:empty)::before {
+  margin-right: .25em;
+}
+
+.separator:not(:empty)::after {
+  margin-left: .25em;
+}
\ No newline at end of file
diff --git a/resources/lang/en-US/auth/general.php b/resources/lang/en-US/auth/general.php
index 4486f090b2..e6a6eed0fc 100644
--- a/resources/lang/en-US/auth/general.php
+++ b/resources/lang/en-US/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'                  => 'Or login with Google Workspace',
+    'google_login'                  => 'Login with Google Workspace',
     'google_login_failed'           => 'Google Login failed, please try again.',
 
 ];
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 5e1ad742e3..ec2c9c121a 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -499,5 +499,6 @@ return [
     'action_permission_generic' => 'You do not have permission to :action this :item_type',
     'edit' => 'edit',
     'action_source' => 'Action Source',
+    'or' => 'or',
 
 ];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index bd91170b7d..16c67ff2b9 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -17,6 +17,18 @@
 
                 <div class="col-md-4 col-md-offset-4">
 
+                    @if (($snipeSettings->google_login=='1') && ($snipeSettings->google_client_id!='') && ($snipeSettings->google_client_secret!=''))
+
+                        <br><br>
+                        <a href="{{ route('google.redirect')  }}" class="btn btn-block btn-social btn-google btn-lg">
+                            <i class="fa-brands fa-google"></i>
+                            {{ trans('auth/general.google_login') }}
+                        </a>
+
+                        <div class="separator">{{ strtoupper(trans('general.or')) }}</div>
+                    @endif
+
+
                     <div class="box login-box">
                         <div class="box-header with-border">
                             <h1 class="box-title"> {{ trans('auth/general.login_prompt')  }}</h1>
@@ -93,12 +105,6 @@
 
                     </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 -->