From 24e554501ad2278a9e9745547af96961b0610e0c Mon Sep 17 00:00:00 2001
From: TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>
Date: Thu, 3 Feb 2022 20:27:20 -0500
Subject: [PATCH] Correct Scrolling Issue

Addresses #359
---
 public/base-locales/fr.json          | 4 +++-
 src/components/layout/auth/Login.jsx | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/base-locales/fr.json b/public/base-locales/fr.json
index a6bc1dacf..3ead6b7b9 100644
--- a/public/base-locales/fr.json
+++ b/public/base-locales/fr.json
@@ -482,5 +482,7 @@
   "gym_badges_subtitle": "Affiche les badges d'arène sur la carte et une liste dans la page profile.",
   "loading": "Chargement {{category}}",
   "loading_icons": "Récupération des Icônes",
-  "loading_invasions": "Récupération des Invasions"
+  "loading_invasions": "Récupération des Invasions",
+  "login_button": 12,
+  "join_button": 12
 }
\ No newline at end of file
diff --git a/src/components/layout/auth/Login.jsx b/src/components/layout/auth/Login.jsx
index 911f5674b..0eb94dc40 100644
--- a/src/components/layout/auth/Login.jsx
+++ b/src/components/layout/auth/Login.jsx
@@ -41,7 +41,7 @@ const Login = ({ clickedTwice, location, serverSettings, getServerSettings }) =>
       direction="column"
       justifyContent="center"
       alignItems="center"
-      style={{ minHeight: '95vh' }}
+      style={{ minHeight: '95vh', width: '100%' }}
     >
       <Grid item style={{ marginTop: 20, marginBottom: 20 }}>
         <Typography variant="h3" style={{ color: 'white' }} align="center">
@@ -49,17 +49,17 @@ const Login = ({ clickedTwice, location, serverSettings, getServerSettings }) =>
         </Typography>
       </Grid>
       {serverSettings?.authMethods?.includes('discord') && (
-        <Grid container item justifyContent="center" alignItems="center" spacing={2} style={{ marginTop: 20, marginBottom: 20 }}>
+        <Grid container item justifyContent="center" alignItems="center" style={{ marginTop: 20, marginBottom: 20 }}>
           <Grid
             item
             xs={serverSettings.config.map.discordInvite ? t('login_button') : 10}
             sm={serverSettings.config.map.discordInvite ? 3 : 10}
-            style={{ textAlign: 'center' }}
+            style={{ textAlign: 'center', marginTop: serverSettings.config.map.discordAuthUrl ? 20 : 0 }}
           >
             <DiscordLogin href={serverSettings.config.map.discordAuthUrl} />
           </Grid>
           {serverSettings.config.map.discordInvite && (
-            <Grid item xs={t('join_button')} sm={3} style={{ textAlign: 'center' }}>
+            <Grid item xs={t('join_button')} sm={3} style={{ textAlign: 'center', marginTop: 20 }}>
               <DiscordLogin href={serverSettings.config.map.discordInvite} text="join" />
             </Grid>
           )}