Skip to content

fix: unify login footer layout #9

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
Willxup merged 2 commits into from
Aug 7, 2026
Merged

fix: unify login footer layout #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
879a2bb
fix: unify login footer layout
Willxup Aug 7, 2026
445545f
fix: remove login page overflow
Willxup Aug 7, 2026
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
12 changes: 12 additions & 0 deletions web/e2e/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ export const tinyWebP = Buffer.from('UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEADsD

export async function login(page: Page) {
await page.goto('/admin/login')
await expect(page.getByRole('contentinfo')).toBeVisible()
const viewport = await page.evaluate(() => {
const loginPage = document.querySelector<HTMLElement>('.login-page')
return {
documentClientHeight: document.documentElement.clientHeight,
documentScrollHeight: document.documentElement.scrollHeight,
loginClientHeight: loginPage?.clientHeight ?? 0,
loginScrollHeight: loginPage?.scrollHeight ?? 0,
}
})
expect(viewport.documentScrollHeight).toBeLessThanOrEqual(viewport.documentClientHeight)
expect(viewport.loginScrollHeight).toBeLessThanOrEqual(viewport.loginClientHeight)
await page.getByLabel('管理员邮箱').fill('e2e@example.com')
await page.getByLabel('密码').fill('imagesilo-e2e-password')
await page.getByRole('button', { name: '登录' }).click()
Expand Down
2 changes: 2 additions & 0 deletions web/src/features/auth/login-page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@ describe('LoginPage', () => {
expect(screen.getByRole('img', { name: 'ImageSilo' })).toBeInTheDocument()
expect(await screen.findByLabelText('管理员邮箱')).toBeInTheDocument()
expect(screen.getByLabelText('密码')).toBeInTheDocument()
expect(screen.getByRole('contentinfo')).toHaveTextContent(/© 2026ImageSilo·License/)
expect(screen.getByRole('link', { name: 'Version: dev' })).toHaveAttribute('href', 'https://github.com/Willxup/imagesilo/releases')
})
})
62 changes: 33 additions & 29 deletions web/src/features/auth/login-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { Navigate, useLocation, useNavigate } from 'react-router-dom'

import { AppFooter } from '../../components/app-footer'
import { BrandLogo } from '../../components/brand-logo'
import { Button } from '../../components/ui/button'
import { DropdownItem, DropdownMenu } from '../../components/ui/dropdown-menu'
Expand Down Expand Up @@ -65,7 +66,7 @@ export function LoginPage() {
}

return (
<main className="login-page text-ink">
<div className="login-page text-ink">
<div className="login-toolbar">
<Button
size="icon-sm"
Expand Down Expand Up @@ -96,37 +97,40 @@ export function LoginPage() {
</DropdownMenu>
</div>

<div className="login-shell">
<div className="login-form-wrap">
<form className="login-form" onSubmit={submit}>
<BrandLogo imageClassName="h-10 w-auto" />
<h1 className="login-form-title">{t('auth.signIn')}</h1>
<p className="login-form-copy">{t('auth.signInDescription')}</p>
<main className="login-page-content">
<div className="login-shell">
<div className="login-form-wrap">
<form className="login-form" onSubmit={submit}>
<BrandLogo imageClassName="h-10 w-auto" />
<h1 className="login-form-title">{t('auth.signIn')}</h1>
<p className="login-form-copy">{t('auth.signInDescription')}</p>

<label className="field-label" htmlFor="email">
{t('auth.email')}
</label>
<div className="field-shell">
<Icon name="mail" />
<Input id="email" type="email" autoComplete="username" maxLength={254} required aria-invalid={Boolean(error)} aria-describedby={error ? 'login-error' : undefined} {...register('email')} />
</div>
<label className="field-label" htmlFor="email">
{t('auth.email')}
</label>
<div className="field-shell">
<Icon name="mail" />
<Input id="email" type="email" autoComplete="username" maxLength={254} required aria-invalid={Boolean(error)} aria-describedby={error ? 'login-error' : undefined} {...register('email')} />
</div>

<label className="field-label" htmlFor="password">
{t('auth.password')}
</label>
<div className="field-shell">
<Icon name="lock" />
<Input id="password" type="password" autoComplete="current-password" maxLength={1024} required aria-invalid={Boolean(error)} aria-describedby={error ? 'login-error' : undefined} {...register('password')} />
</div>
<label className="field-label" htmlFor="password">
{t('auth.password')}
</label>
<div className="field-shell">
<Icon name="lock" />
<Input id="password" type="password" autoComplete="current-password" maxLength={1024} required aria-invalid={Boolean(error)} aria-describedby={error ? 'login-error' : undefined} {...register('password')} />
</div>

{error ? <p id="login-error" role="alert" className="mt-4 rounded-xl border border-danger/20 bg-danger-soft px-4 py-3 text-sm text-danger">{error}</p> : null}
<Button type="submit" disabled={formState.isSubmitting} className="mt-5 w-full bg-[var(--silo-gradient)] hover:opacity-90">
<span className="login-submit-label">{formState.isSubmitting ? t('common.working') : t('auth.signIn')}</span>
<Icon name="arrowRight" />
</Button>
</form>
{error ? <p id="login-error" role="alert" className="mt-4 rounded-xl border border-danger/20 bg-danger-soft px-4 py-3 text-sm text-danger">{error}</p> : null}
<Button type="submit" disabled={formState.isSubmitting} className="mt-5 w-full bg-[var(--silo-gradient)] hover:opacity-90">
<span className="login-submit-label">{formState.isSubmitting ? t('common.working') : t('auth.signIn')}</span>
<Icon name="arrowRight" />
</Button>
</form>
</div>
</div>
</div>
</main>
</main>
<AppFooter />
</div>
)
}
45 changes: 31 additions & 14 deletions web/src/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,15 +2554,31 @@ input[type="checkbox"]:disabled {
display: flex;
min-height: 100vh;
min-height: 100dvh;
align-items: center;
justify-content: flex-end;
overflow-x: hidden;
overflow-y: auto;
flex-direction: column;
overflow-x: clip;
background: var(--login-backdrop);
padding: 76px clamp(40px, 6vw, 96px) 52px;
isolation: isolate;
}

.login-page-content {
position: relative;
z-index: 2;
display: flex;
width: 100%;
min-height: 0;
flex: 1 0 auto;
align-items: center;
justify-content: flex-end;
padding: 72px clamp(40px, 6vw, 96px) clamp(12px, 3dvh, 28px);
}

.login-page > .app-footer {
position: relative;
z-index: 2;
width: 100%;
padding-top: 12px;
}

.login-page::before,
.login-page::after {
position: absolute;
Expand All @@ -2572,7 +2588,7 @@ input[type="checkbox"]:disabled {
}

.login-page::before {
inset: -8%;
inset: 0 -8%;
background: url('/brand/imagesilo-login-mosaic.svg') center / cover no-repeat;
filter: saturate(0.92) contrast(0.98);
}
Expand Down Expand Up @@ -2643,7 +2659,7 @@ input[type="checkbox"]:disabled {
border: 1px solid var(--login-card-border);
border-radius: 24px;
background: var(--login-card);
padding: 42px 40px 40px;
padding: clamp(28px, 5dvh, 42px) 40px clamp(28px, 5dvh, 40px);
box-shadow: 0 24px 72px rgba(35, 43, 56, 0.2), 0 4px 18px rgba(35, 43, 56, 0.08);
backdrop-filter: blur(24px);
}
Expand Down Expand Up @@ -2691,15 +2707,15 @@ input[type="checkbox"]:disabled {
}

.login-form-title {
margin: 30px 0 0;
margin: clamp(20px, 4dvh, 30px) 0 0;
color: var(--tail-text);
font-size: 32px;
font-weight: 600;
line-height: 40px;
}

.login-form-copy {
margin: 8px 0 28px;
margin: 8px 0 clamp(20px, 4dvh, 28px);
color: var(--tail-text-soft);
font-size: 12px;
line-height: 18px;
Expand Down Expand Up @@ -2821,10 +2837,10 @@ input[type="checkbox"]:disabled {
min-height: 0;
}

.login-page {
.login-page-content {
align-items: center;
justify-content: center;
padding: 92px 24px 40px;
padding: 92px 24px clamp(12px, 3dvh, 28px);
}

.login-page::before {
Expand All @@ -2847,7 +2863,8 @@ input[type="checkbox"]:disabled {

.login-form-wrap {
min-height: 0;
padding: 42px 36px 40px;
padding-right: 36px;
padding-left: 36px;
}
}

Expand Down Expand Up @@ -2923,9 +2940,9 @@ input[type="checkbox"]:disabled {
top: 14px;
}

.login-page {
.login-page-content {
align-items: center;
padding: 64px 16px;
padding: 64px 16px clamp(8px, 2dvh, 16px);
}

.login-page::before {
Expand Down