IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Login: Fix footer from displaying under the login box (#70897)

Browse Source
This commit is contained in:
Josh Hunt 2023-06-29 14:16:55 +01:00 committed by GitHub
parent bb7a3be86e
commit ae2378395b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/Branding/Branding.tsx
View File

@ -19,7 +19,7 @@ const LoginBackground: FC<BrandComponentProps> = ({ className, children }) => {
const background = css`
&:before {
content: '';
position: absolute;
position: fixed;
left: 0;
right: 0;
bottom: 0;

36
public/app/core/components/Login/LoginLayout.tsx
View File

@ -36,21 +36,23 @@ export const LoginLayout = ({ children, branding, isChangingPassword }: React.Pr
<Branding.LoginBackground
className={cx(loginStyles.container, startAnim && loginStyles.loginAnim, branding?.loginBackground)}
>
<div className={cx(loginStyles.loginContent, loginBoxBackground, 'login-content-box')}>
<div className={loginStyles.loginLogoWrapper}>
<Branding.LoginLogo className={loginStyles.loginLogo} logo={loginLogo} />
<div className={loginStyles.titleWrapper}>
{isChangingPassword ? (
<h1 className={loginStyles.mainTitle}>Update your password</h1>
) : (
<>
<h1 className={loginStyles.mainTitle}>{loginTitle}</h1>
{subTitle && <h3 className={loginStyles.subTitle}>{subTitle}</h3>}
</>
)}
<div className={loginStyles.loginMain}>
<div className={cx(loginStyles.loginContent, loginBoxBackground, 'login-content-box')}>
<div className={loginStyles.loginLogoWrapper}>
<Branding.LoginLogo className={loginStyles.loginLogo} logo={loginLogo} />
<div className={loginStyles.titleWrapper}>
{isChangingPassword ? (
<h1 className={loginStyles.mainTitle}>Update your password</h1>
) : (
<>
<h1 className={loginStyles.mainTitle}>{loginTitle}</h1>
{subTitle && <h3 className={loginStyles.subTitle}>{subTitle}</h3>}
</>
)}
</div>
</div>
<div className={loginStyles.loginOuterBox}>{children}</div>
</div>
<div className={loginStyles.loginOuterBox}>{children}</div>
</div>
{branding?.hideFooter ? <></> : <Footer customLinks={branding?.footerLinks} />}
</Branding.LoginBackground>
@ -70,6 +72,14 @@ to{
export const getLoginStyles = (theme: GrafanaTheme2) => {
return {
loginMain: css({
flexGrow: 1,
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
minWidth: '100%',
}),
container: css({
minHeight: '100%',
backgroundPosition: 'center',

2
public/sass/components/_footer.scss
View File

@ -47,8 +47,6 @@
.login-page {
.footer {
display: block;
bottom: $spacer;
position: absolute;
padding: $space-md 0 $space-md 0;
color: $text-color;