From 3d7f5253e8686e775a0c38cc11960d041ab00315 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Fri, 27 Jun 2025 17:32:01 +0000 Subject: [PATCH] update fonts --- ts_web/elements/00fonts.ts | 16 ++++++++++++++++ ts_web/elements/dees-dataview-codebox.ts | 5 +++-- ts_web/elements/dees-heading.ts | 3 ++- ts_web/elements/dees-input-checkbox.ts | 3 ++- ts_web/elements/dees-input-dropdown.ts | 3 ++- ts_web/elements/dees-input-text.ts | 5 +++-- ts_web/elements/dees-modal.ts | 5 +++-- ts_web/elements/dees-statsgrid.ts | 16 +++++++++++----- ts_web/elements/dees-table.ts | 9 +++++---- ts_web/elements/dees-toast.ts | 3 ++- .../elements/wysiwyg/blocks/text/code.block.ts | 9 +++++---- 11 files changed, 54 insertions(+), 23 deletions(-) diff --git a/ts_web/elements/00fonts.ts b/ts_web/elements/00fonts.ts index c13a238..7ce3c13 100644 --- a/ts_web/elements/00fonts.ts +++ b/ts_web/elements/00fonts.ts @@ -26,6 +26,22 @@ export const monoFontFamily = `'${intelOneMonoFont}', 'SF Mono', 'Monaco', 'Inco export const cssGeistFontFamily = unsafeCSS(geistFontFamily); export const cssMonoFontFamily = unsafeCSS(monoFontFamily); +/** + * Cal Sans font for headings - Display font + * May need to be loaded separately + */ +export const calSansFont = 'Cal Sans'; +export const calSansFontFamily = `'${calSansFont}', ${geistFontFamily}`; +export const cssCalSansFontFamily = unsafeCSS(calSansFontFamily); + +/** + * Roboto Slab font for special content - Serif font + * May need to be loaded separately + */ +export const robotoSlabFont = 'Roboto Slab'; +export const robotoSlabFontFamily = `'${robotoSlabFont}', Georgia, serif`; +export const cssRobotoSlabFontFamily = unsafeCSS(robotoSlabFontFamily); + /** * Base font styles that can be applied to components */ diff --git a/ts_web/elements/dees-dataview-codebox.ts b/ts_web/elements/dees-dataview-codebox.ts index 8710e50..9a5865e 100644 --- a/ts_web/elements/dees-dataview-codebox.ts +++ b/ts_web/elements/dees-dataview-codebox.ts @@ -8,6 +8,7 @@ import { state, cssManager, } from '@design.estate/dees-element'; +import { cssGeistFontFamily, cssMonoFontFamily } from './00fonts.js'; import hlight from 'highlight.js'; @@ -48,7 +49,7 @@ export class DeesDataviewCodebox extends DeesElement { display: block; text-align: left; font-size: 16px; - font-family: 'Geist Sans', sans-serif; + font-family: ${cssGeistFontFamily}; } .mainbox { position: relative; @@ -142,7 +143,7 @@ export class DeesDataviewCodebox extends DeesElement { .lineNumbers { line-height: 1.4em; font-weight: 200; - font-family: 'Intel One Mono', 'Geist Mono', 'monospace'; + font-family: ${cssMonoFontFamily}; } .hljs-string { diff --git a/ts_web/elements/dees-heading.ts b/ts_web/elements/dees-heading.ts index 6406b1f..8c54da3 100644 --- a/ts_web/elements/dees-heading.ts +++ b/ts_web/elements/dees-heading.ts @@ -10,6 +10,7 @@ import { } from '@design.estate/dees-element'; import { demoFunc } from './dees-heading.demo.js'; +import { cssCalSansFontFamily } from './00fonts.js'; declare global { interface HTMLElementTagNameMap { @@ -39,7 +40,7 @@ export class DeesHeading extends DeesElement { font-weight: 600; color: ${cssManager.bdTheme('#000', '#fff')}; } - h1 { font-size: 32px; font-family: 'Cal Sans'; letter-spacing: 0.025em;} + h1 { font-size: 32px; font-family: ${cssCalSansFontFamily}; letter-spacing: 0.025em;} h2 { font-size: 28px; } h3 { font-size: 24px; } h4 { font-size: 20px; } diff --git a/ts_web/elements/dees-input-checkbox.ts b/ts_web/elements/dees-input-checkbox.ts index 3c10a79..7431d4c 100644 --- a/ts_web/elements/dees-input-checkbox.ts +++ b/ts_web/elements/dees-input-checkbox.ts @@ -8,6 +8,7 @@ import { } from '@design.estate/dees-element'; import { DeesInputBase } from './dees-input-base.js'; import { demoFunc } from './dees-input-checkbox.demo.js'; +import { cssGeistFontFamily } from './00fonts.js'; declare global { interface HTMLElementTagNameMap { @@ -44,7 +45,7 @@ export class DeesInputCheckbox extends DeesInputBase { :host { position: relative; cursor: default; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif; + font-family: ${cssGeistFontFamily}; } .maincontainer { diff --git a/ts_web/elements/dees-input-dropdown.ts b/ts_web/elements/dees-input-dropdown.ts index 02e0140..460e0a9 100644 --- a/ts_web/elements/dees-input-dropdown.ts +++ b/ts_web/elements/dees-input-dropdown.ts @@ -10,6 +10,7 @@ import { import * as domtools from '@design.estate/dees-domtools'; import { demoFunc } from './dees-input-dropdown.demo.js'; import { DeesInputBase } from './dees-input-base.js'; +import { cssGeistFontFamily } from './00fonts.js'; declare global { interface HTMLElementTagNameMap { @@ -67,7 +68,7 @@ export class DeesInputDropdown extends DeesInputBase { } :host { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif; + font-family: ${cssGeistFontFamily}; position: relative; color: ${cssManager.bdTheme('hsl(0 0% 15%)', 'hsl(0 0% 90%)')}; } diff --git a/ts_web/elements/dees-input-text.ts b/ts_web/elements/dees-input-text.ts index 6a6e3a9..e62244d 100644 --- a/ts_web/elements/dees-input-text.ts +++ b/ts_web/elements/dees-input-text.ts @@ -1,6 +1,7 @@ import * as colors from './00colors.js'; import { DeesInputBase } from './dees-input-base.js'; import { demoFunc } from './dees-input-text.demo.js'; +import { cssGeistFontFamily, cssMonoFontFamily } from './00fonts.js'; import { customElement, @@ -65,7 +66,7 @@ export class DeesInputText extends DeesInputBase { :host { position: relative; z-index: auto; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif; + font-family: ${cssGeistFontFamily}; } .maincontainer { @@ -193,7 +194,7 @@ export class DeesInputText extends DeesInputBase { return html`