Skip to content

[26.7] Passkey icons use wrong color variant when realm disables dark mode (#51091) #51116

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

Open
mabartos wants to merge 1 commit into
base: release/26.7
Choose a base branch
from
Open

[26.7] Passkey icons use wrong color variant when realm disables dark mode (#51091) #51116

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
1 change: 1 addition & 0 deletions js/apps/account-ui/maven-resources/theme/keycloak.v3/account/index.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
"resourceUrl": "${resourceUrl}",
"logo": "${properties.logo!""}",
"logoUrl": "${properties.logoUrl!""}",
"darkMode": ${darkMode?c},
"baseUrl": "${baseUrl}",
"locale": "${locale}",
"referrerName": "${referrerName!""}",
Expand Down
2 changes: 1 addition & 1 deletion js/apps/account-ui/src/account-security/SigningIn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export const SigningIn = () => {
>
<div className="pf-v5-c-icon pf-m-xl">
<picture>
{iconDarkSrc && (
{context.environment.darkMode && iconDarkSrc && (
<source
srcSet={iconDarkSrc}
media="(prefers-color-scheme: dark)"
Expand Down
1 change: 1 addition & 0 deletions js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/index.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
"resourceUrl": "${resourceUrl}",
"logo": "${properties.logo!""}",
"logoUrl": "${properties.logoUrl!""}",
"darkMode": ${darkMode?c},
"consoleBaseUrl": "${consoleBaseUrl}",
"masterRealm": "${masterRealm}",
"resourceVersion": "${resourceVersion}"
Expand Down
1 change: 1 addition & 0 deletions ...pps/create-keycloak-theme/templates/maven-resources/theme/my-account/account/index.ftl.mu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"resourceUrl": "${resourceUrl}",
"logo": "${properties.logo!""}",
"logoUrl": "${properties.logoUrl!""}",
"darkMode": ${darkMode?c},
"baseUrl": "${baseUrl}",
"locale": "${locale}",
"referrerName": "${referrerName!""}",
Expand Down
2 changes: 2 additions & 0 deletions js/libs/ui-shared/src/context/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export type BaseEnvironment = {
logo: string;
/** The URL to be followed when the logo is clicked. */
logoUrl: string;
/** Whether dark mode is enabled for the realm. */
darkMode: boolean;
/** The scopes to be requested when sending authorization requests*/
scope?: string;
};
Expand Down
2 changes: 1 addition & 1 deletion themes/src/main/resources/theme/keycloak.v2/login/webauthn-authenticate.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div class="${properties.kcWebAuthnDefaultIcon!}">
<#if authenticator.iconLight?? || authenticator.iconDark??>
<picture>
<#if authenticator.iconDark??>
<#if darkMode && authenticator.iconDark??>
<source srcset="${url.resourcesPath}/img/passkeys/${authenticator.iconDark}" media="(prefers-color-scheme: dark)">
</#if>
<img src="${url.resourcesPath}/img/passkeys/${authenticator.iconLight!authenticator.iconDark!''}" alt="" width="40" height="40">
Expand Down
Loading