Skip to content

Correct Scrolling Issue #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TurtIeSocks merged 1 commit into from
Feb 4, 2022
Merged

Correct Scrolling Issue #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion public/base-locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
8 changes: 4 additions & 4 deletions src/components/layout/auth/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,25 @@ 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">
{t('welcome')} {serverSettings.config.map.headerTitle}
</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>
)}
Expand Down