Skip to content

Commit 2c29e07

Browse files
committed
Style updates to align with Figma
1 parent ea27928 commit 2c29e07

File tree

8 files changed

+27
-23
lines changed

8 files changed

+27
-23
lines changed

src/login/Template.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ const Footer = styled.footer(({ theme }) => ({
5555
color: theme.custom.colors.silverGrayDark,
5656
display: "flex",
5757
flexDirection: "column",
58-
gap: "10px",
59-
paddingInline: "32px"
58+
gap: "16px",
59+
paddingInline: "32px",
60+
margin: "12px 0"
6061
}))
6162

6263
export default function Template(props: TemplateProps<KcContext, I18n>) {

src/login/UserProfileFormFields.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type { Attribute } from "keycloakify/login/KcContext"
1212
import type { KcContext } from "./KcContext"
1313
import type { I18n } from "./i18n"
1414
import { Label, ValidationMessage, RevealPasswordButton, HelperText } from "./components/Elements"
15-
import { TextField } from "@mitodl/smoot-design"
15+
import { StyledTextField } from "./components/Elements"
1616

1717
export default function UserProfileFormFields(props: Omit<UserProfileFormFieldsProps<KcContext, I18n>, "kcClsx">) {
1818
const { kcContext, i18n, onIsFormSubmittableValueChange, doMakeUserConfirmPassword, BeforeField, AfterField } = props
@@ -233,7 +233,7 @@ function InputTag(props: InputFieldByTypeProps & { fieldIndex: number | undefine
233233

234234
return (
235235
<>
236-
<TextField
236+
<StyledTextField
237237
size="medium"
238238
id={attribute.name}
239239
name={attribute.name}

src/login/components/Elements.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import {
44
Button as SmootButton,
55
ButtonLink as SmootButtonLink,
66
Alert as SmootAlert,
7-
AdornmentButton as SmootAdornmentButton
7+
AdornmentButton as SmootAdornmentButton,
8+
TextField
89
} from "@mitodl/smoot-design"
910
import { useIsPasswordRevealed } from "keycloakify/tools/useIsPasswordRevealed"
1011
import { RiEyeLine, RiEyeOffLine } from "@remixicon/react"
@@ -22,7 +23,8 @@ export const Link = styled.a(({ theme }) => ({
2223
export const Label = styled.label(({ theme }) => ({
2324
...theme.typography.body1,
2425
display: "block",
25-
marginBottom: theme.typography.pxToRem(12)
26+
marginBottom: theme.typography.pxToRem(12),
27+
color: theme.custom.colors.darkGray1
2628
}))
2729

2830
export const Input = styled(SmootInput)({
@@ -177,6 +179,12 @@ const AdornmentButton = styled(SmootAdornmentButton)(({ theme }) => ({
177179
}
178180
}))
179181

182+
export const StyledTextField = styled(TextField)(({ theme }) => ({
183+
label: {
184+
color: theme.custom.colors.darkGray1
185+
}
186+
}))
187+
180188
export const RevealPasswordButton = ({
181189
i18n,
182190
passwordInputId

src/login/pages/Login.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import { useState } from "react"
22
import type { PageProps } from "keycloakify/login/pages/PageProps"
33
import type { KcContext } from "../KcContext"
44
import type { I18n } from "../i18n"
5-
import { Link, Button, Form, Info, ButtonLink, SocialProviderButtonLink, OrBar, RevealPasswordButton } from "../components/Elements"
5+
import { Link, Button, Form, Info, ButtonLink, SocialProviderButtonLink, OrBar, RevealPasswordButton, StyledTextField } from "../components/Elements"
66
import mitLogo from "../components/mit-logo.svg"
7-
import { TextField } from "@mitodl/smoot-design"
87

98
export default function Login(props: PageProps<Extract<KcContext, { pageId: "login.ftl" }>, I18n>) {
109
const { kcContext, i18n, doUseDefaultCss, Template, classes } = props
@@ -68,7 +67,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
6867
method="post"
6968
>
7069
{!usernameHidden && (
71-
<TextField
70+
<StyledTextField
7271
id="username"
7372
label={
7473
!realm.loginWithEmailAllowed ? msg("username") : !realm.registrationEmailAsUsername ? msg("usernameOrEmail") : msg("email")
@@ -87,7 +86,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
8786
/>
8887
)}
8988

90-
<TextField
89+
<StyledTextField
9190
id="password"
9291
label={msg("password")}
9392
name="password"

src/login/pages/LoginPassword.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import { useState } from "react"
22
import type { PageProps } from "keycloakify/login/pages/PageProps"
33
import type { KcContext } from "../KcContext"
44
import type { I18n } from "../i18n"
5-
import { Link, Form, Button, RevealPasswordButton } from "../components/Elements"
6-
import { TextField } from "@mitodl/smoot-design"
5+
import { Link, Form, Button, RevealPasswordButton, StyledTextField } from "../components/Elements"
76

87
export default function LoginPassword(props: PageProps<Extract<KcContext, { pageId: "login-password.ftl" }>, I18n>) {
98
const { kcContext, i18n, doUseDefaultCss, Template, classes } = props
@@ -34,7 +33,7 @@ export default function LoginPassword(props: PageProps<Extract<KcContext, { page
3433
action={url.loginAction}
3534
method="post"
3635
>
37-
<TextField
36+
<StyledTextField
3837
id="password"
3938
label={msg("password")}
4039
name="password"

src/login/pages/LoginResetPassword.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import type { PageProps } from "keycloakify/login/pages/PageProps"
22
import type { KcContext } from "../KcContext"
33
import type { I18n } from "../i18n"
4-
import { Button, Form, Subtitle } from "../components/Elements"
5-
import { TextField } from "@mitodl/smoot-design"
4+
import { Button, Form, Subtitle, StyledTextField } from "../components/Elements"
65

76
export default function LoginResetPassword(props: PageProps<Extract<KcContext, { pageId: "login-reset-password.ftl" }>, I18n>) {
87
const { kcContext, i18n, doUseDefaultCss, Template, classes } = props
@@ -23,7 +22,7 @@ export default function LoginResetPassword(props: PageProps<Extract<KcContext, {
2322
>
2423
<Subtitle>{realm.duplicateEmailsAllowed ? msg("emailInstructionUsername") : msg("emailInstruction")}</Subtitle>
2524
<Form id="kc-reset-password-form" action={url.loginAction} method="post">
26-
<TextField
25+
<StyledTextField
2726
id="username"
2827
label={!realm.loginWithEmailAllowed ? msg("username") : !realm.registrationEmailAsUsername ? msg("usernameOrEmail") : msg("email")}
2928
name="username"

src/login/pages/LoginUpdatePassword.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import type { PageProps } from "keycloakify/login/pages/PageProps"
22
import type { KcContext } from "../KcContext"
33
import type { I18n } from "../i18n"
4-
import { Button, Form, RevealPasswordButton } from "../components/Elements"
5-
import { TextField } from "@mitodl/smoot-design"
4+
import { Button, Form, RevealPasswordButton, StyledTextField } from "../components/Elements"
65

76
export default function LoginUpdatePassword(props: PageProps<Extract<KcContext, { pageId: "login-update-password.ftl" }>, I18n>) {
87
const { kcContext, i18n, doUseDefaultCss, Template, classes } = props
@@ -21,7 +20,7 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
2120
headerNode={msg("updatePasswordTitle")}
2221
>
2322
<Form id="kc-passwd-update-form" action={url.loginAction} method="post">
24-
<TextField
23+
<StyledTextField
2524
id="password-new"
2625
label={msg("passwordNew")}
2726
name="password-new"
@@ -36,7 +35,7 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
3635
error={messagesPerField.existsError("password")}
3736
endAdornment={<RevealPasswordButton i18n={i18n} passwordInputId="password-new" />}
3837
/>
39-
<TextField
38+
<StyledTextField
4039
id="password-confirm"
4140
label={msg("passwordConfirm")}
4241
name="password-confirm"

src/login/pages/LoginUsername.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import { clsx } from "keycloakify/tools/clsx"
33
import type { PageProps } from "keycloakify/login/pages/PageProps"
44
import type { KcContext } from "../KcContext"
55
import type { I18n } from "../i18n"
6-
import { Link, Button, Form, Info, SocialProviderButtonLink, OrBar } from "../components/Elements"
6+
import { Link, Button, Form, Info, SocialProviderButtonLink, OrBar, StyledTextField } from "../components/Elements"
77
import mitLogo from "../components/mit-logo.svg"
8-
import { TextField } from "@mitodl/smoot-design"
98

109
export default function LoginUsername(props: PageProps<Extract<KcContext, { pageId: "login-username.ftl" }>, I18n>) {
1110
const { kcContext, i18n, doUseDefaultCss, Template, classes } = props
@@ -65,7 +64,7 @@ export default function LoginUsername(props: PageProps<Extract<KcContext, { page
6564
method="post"
6665
>
6766
{!usernameHidden && (
68-
<TextField
67+
<StyledTextField
6968
id="username"
7069
label={!realm.loginWithEmailAllowed ? msg("username") : !realm.registrationEmailAsUsername ? msg("usernameOrEmail") : msg("email")}
7170
name="username"

0 commit comments

Comments
 (0)