diff --git a/hassio/src/entrypoint.ts b/hassio/src/entrypoint.ts index 7efede19d2..d26b78f19e 100644 --- a/hassio/src/entrypoint.ts +++ b/hassio/src/entrypoint.ts @@ -1,3 +1,4 @@ +import { haFontFamilyBody } from "../../src/resources/theme/typography.globals"; import "./hassio-main"; import("../../src/resources/append-ha-style"); @@ -5,7 +6,7 @@ import("../../src/resources/append-ha-style"); const styleEl = document.createElement("style"); styleEl.textContent = ` body { - font-family: Roboto, sans-serif; + font-family: ${haFontFamilyBody}; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; font-weight: 400; diff --git a/src/components/chips/ha-assist-chip.ts b/src/components/chips/ha-assist-chip.ts index 2775264aa4..275d2a7d20 100644 --- a/src/components/chips/ha-assist-chip.ts +++ b/src/components/chips/ha-assist-chip.ts @@ -60,7 +60,7 @@ export class HaAssistChip extends AssistChip { opacity: var(--ha-assist-chip-active-container-opacity); } .label { - font-family: Roboto, sans-serif; + font-family: var(--ha-font-family-body); } `, ]; diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index 66d7a3ba60..100496a858 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -928,7 +928,7 @@ export class HaDataTable extends LitElement { height: 100%; } .mdc-data-table__content { - font-family: Roboto, sans-serif; + font-family: var(--ha-font-family-body); -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; font-size: 0.875rem; @@ -1048,7 +1048,7 @@ export class HaDataTable extends LitElement { } .mdc-data-table__cell { - font-family: Roboto, sans-serif; + font-family: var(--ha-font-family-body); -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; font-size: 0.875rem; @@ -1170,7 +1170,7 @@ export class HaDataTable extends LitElement { } .mdc-data-table__header-cell { - font-family: Roboto, sans-serif; + font-family: var(--ha-font-family-body); -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; font-size: 0.875rem; diff --git a/src/components/ha-base-time-input.ts b/src/components/ha-base-time-input.ts index bc873e499b..0839cf05c3 100644 --- a/src/components/ha-base-time-input.ts +++ b/src/components/ha-base-time-input.ts @@ -385,7 +385,7 @@ export class HaBaseTimeInput extends LitElement { -webkit-font-smoothing: antialiased; font-family: var( --mdc-typography-body2-font-family, - var(--mdc-typography-font-family, Roboto, sans-serif) + var(--mdc-typography-font-family, var(--ha-font-family-body)) ); font-size: var(--mdc-typography-body2-font-size, 0.875rem); line-height: var(--mdc-typography-body2-line-height, 1.25rem); diff --git a/src/components/ha-control-button.ts b/src/components/ha-control-button.ts index f680c23a5b..c07898fa70 100644 --- a/src/components/ha-control-button.ts +++ b/src/components/ha-control-button.ts @@ -58,7 +58,7 @@ export class HaControlButton extends LitElement { padding: var(--control-button-padding); box-sizing: border-box; line-height: inherit; - font-family: Roboto; + font-family: var(--ha-font-family-body); font-weight: 500; outline: none; overflow: hidden; diff --git a/src/components/ha-outlined-text-field.ts b/src/components/ha-outlined-text-field.ts index e50357cfb4..194b48659d 100644 --- a/src/components/ha-outlined-text-field.ts +++ b/src/components/ha-outlined-text-field.ts @@ -37,7 +37,7 @@ export class HaOutlinedTextField extends OutlinedTextField { --mdc-icon-size: var(--md-input-chip-icon-size, 18px); } .input { - font-family: Roboto, sans-serif; + font-family: var(--ha-font-family-body); } `, ]; diff --git a/src/components/ha-settings-row.ts b/src/components/ha-settings-row.ts index 1f9770a1e7..9d0adcbc86 100644 --- a/src/components/ha-settings-row.ts +++ b/src/components/ha-settings-row.ts @@ -66,7 +66,7 @@ export class HaSettingsRow extends LitElement { padding-top: 4px; font-family: var( --mdc-typography-body2-font-family, - var(--mdc-typography-font-family, Roboto, sans-serif) + var(--mdc-typography-font-family, var(--ha-font-family-body)) ); -webkit-font-smoothing: antialiased; font-size: var(--mdc-typography-body2-font-size, 0.875rem); diff --git a/src/dialogs/config-flow/styles.ts b/src/dialogs/config-flow/styles.ts index 0e2aca3e7b..30a5dd46de 100644 --- a/src/dialogs/config-flow/styles.ts +++ b/src/dialogs/config-flow/styles.ts @@ -12,7 +12,7 @@ export const configFlowContentStyles = css` -webkit-font-smoothing: antialiased; font-family: var( --mdc-typography-headline6-font-family, - var(--mdc-typography-font-family, Roboto, sans-serif) + var(--mdc-typography-font-family, var(--ha-font-family-body)) ); font-size: var(--mdc-typography-headline6-font-size, 1.25rem); line-height: var(--mdc-typography-headline6-line-height, 2rem); diff --git a/src/html/_style_base.html.template b/src/html/_style_base.html.template index ca503868fe..8e075daaf3 100644 --- a/src/html/_style_base.html.template +++ b/src/html/_style_base.html.template @@ -1,7 +1,7 @@