jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-28 11:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move vaadin typography vars to typography globals (#25398)

Browse Source
This commit is contained in:
Bram Kragten 2025-05-09 14:08:12 +02:00 committed by GitHub
parent 461d5eb687
commit 15ae37d077
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/style/derived-css-vars.ts
View File

@ -2,7 +2,7 @@ import type { CSSResult } from "lit";
const _extractCssVars = ( const _extractCssVars = (
cssString: string, cssString: string,
condition: (string) => boolean = () => true condition: (string: string) => boolean = () => true
) => { ) => {
const variables: Record<string, string> = {}; const variables: Record<string, string> = {};

2
src/resources/theme/color.globals.ts
View File

@ -299,6 +299,7 @@ export const colorStyles = css`
`; `;
const darkColorStyles = css` const darkColorStyles = css`
html {
--primary-background-color: #111111; --primary-background-color: #111111;
--card-background-color: #1c1c1c; --card-background-color: #1c1c1c;
--secondary-background-color: #282828; --secondary-background-color: #282828;
@ -351,6 +352,7 @@ const darkColorStyles = css`
--map-filter: invert(0.9) hue-rotate(170deg) brightness(1.5) contrast(1.2) --map-filter: invert(0.9) hue-rotate(170deg) brightness(1.5) contrast(1.2)
saturate(0.3); saturate(0.3);
--disabled-color: #464646; --disabled-color: #464646;
}
`; `;
export const colorDerivedVariables = extractDerivedVars(colorStyles); export const colorDerivedVariables = extractDerivedVars(colorStyles);
export const darkColorVariables = extractVars(darkColorStyles); export const darkColorVariables = extractVars(darkColorStyles);

6
src/resources/theme/main.globals.ts
View File

@ -26,12 +26,6 @@ export const mainStyles = css`
--float-end: right; --float-end: right;
--margin-title-ltr: 0 0 0 24px; --margin-title-ltr: 0 0 0 24px;
--margin-title-rtl: 0 24px 0 0; --margin-title-rtl: 0 24px 0 0;
/* Vaadin typography */
--material-h6-font-size: var(--ha-font-size-m);
--material-small-font-size: var(--ha-font-size-xs);
--material-caption-font-size: var(--ha-font-size-2xs);
--material-button-font-size: var(--ha-font-size-xs);
} }
`; `;

6
src/resources/theme/typography.globals.ts
View File

@ -44,6 +44,12 @@ export const typographyStyles = css`
--ha-font-smoothing: antialiased; --ha-font-smoothing: antialiased;
--ha-moz-osx-font-smoothing: grayscale; --ha-moz-osx-font-smoothing: grayscale;
/* Vaadin typography */
--material-h6-font-size: var(--ha-font-size-m);
--material-small-font-size: var(--ha-font-size-xs);
--material-caption-font-size: var(--ha-font-size-2xs);
--material-button-font-size: var(--ha-font-size-xs);
} }
`; `;