diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 5f2a906251..8b1d3a0ef9 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -6,7 +6,7 @@ }, { "path": "./packages/orange/dist/css/ouds-web-bootstrap.min.css", - "maxSize": "79.25 kB" + "maxSize": "79.5 kB" }, { "path": "./packages/orange/dist/css/ouds-web-grid.css", @@ -34,11 +34,11 @@ }, { "path": "./packages/orange/dist/css/ouds-web.css", - "maxSize": "66.5 kB" + "maxSize": "66.75 kB" }, { "path": "./packages/orange/dist/css/ouds-web.min.css", - "maxSize": "62.5 kB" + "maxSize": "62.75 kB" }, { "path": "./dist/js/ouds-web.bundle.js", diff --git a/scss/_maps.scss b/scss/_maps.scss index 79261faf4f..026211b0b9 100644 --- a/scss/_maps.scss +++ b/scss/_maps.scss @@ -123,6 +123,10 @@ $ouds-elevations: ( // scss-docs-start ouds-maps-font $ouds-font-sizes: ( + lxl: "/label-xlarge", + ll: "/label-large", + lm: "/label-medium", + ls: "/label-small", cm: "/code-medium", bs: "/body-small", bm: "/body-medium", diff --git a/scss/tests/customize/_ouds-web-bootstrap-utilities.test.scss b/scss/tests/customize/_ouds-web-bootstrap-utilities.test.scss index d722fa63d4..ed6e6f44de 100644 --- a/scss/tests/customize/_ouds-web-bootstrap-utilities.test.scss +++ b/scss/tests/customize/_ouds-web-bootstrap-utilities.test.scss @@ -3508,6 +3508,38 @@ $utilities: (); /* rtl:end:remove */ + .fs-lxl { + font-size: var(--bs-font-size-label-xlarge); + line-height: var(--bs-font-line-height-label-xlarge); + + /* rtl:remove */ + letter-spacing: var(--bs-font-letter-spacing-label-xlarge); + } + + .fs-ll { + font-size: var(--bs-font-size-label-large); + line-height: var(--bs-font-line-height-label-large); + + /* rtl:remove */ + letter-spacing: var(--bs-font-letter-spacing-label-large); + } + + .fs-lm { + font-size: var(--bs-font-size-label-medium); + line-height: var(--bs-font-line-height-label-medium); + + /* rtl:remove */ + letter-spacing: var(--bs-font-letter-spacing-label-medium); + } + + .fs-ls { + font-size: var(--bs-font-size-label-small); + line-height: var(--bs-font-line-height-label-small); + + /* rtl:remove */ + letter-spacing: var(--bs-font-letter-spacing-label-small); + } + .fs-cm { font-size: var(--bs-font-size-code-medium); line-height: var(--bs-font-line-height-code-medium); @@ -15430,6 +15462,38 @@ $utilities: (); /* rtl:end:remove */ + .fs-lxl { + font-size: var(--bs-font-size-label-xlarge); + line-height: var(--bs-font-line-height-label-xlarge); + + /* rtl:remove */ + letter-spacing: var(--bs-font-letter-spacing-label-xlarge); + } + + .fs-ll { + font-size: var(--bs-font-size-label-large); + line-height: var(--bs-font-line-height-label-large); + + /* rtl:remove */ + letter-spacing: var(--bs-font-letter-spacing-label-large); + } + + .fs-lm { + font-size: var(--bs-font-size-label-medium); + line-height: var(--bs-font-line-height-label-medium); + + /* rtl:remove */ + letter-spacing: var(--bs-font-letter-spacing-label-medium); + } + + .fs-ls { + font-size: var(--bs-font-size-label-small); + line-height: var(--bs-font-line-height-label-small); + + /* rtl:remove */ + letter-spacing: var(--bs-font-letter-spacing-label-small); + } + .fs-cm { font-size: var(--bs-font-size-code-medium); line-height: var(--bs-font-line-height-code-medium); diff --git a/site/src/content/docs/foundation/typography.mdx b/site/src/content/docs/foundation/typography.mdx index 05c8953d23..e647542c31 100644 --- a/site/src/content/docs/foundation/typography.mdx +++ b/site/src/content/docs/foundation/typography.mdx @@ -30,6 +30,13 @@ export const textLevel = [ "body-small" ] +export const labelLevel = [ + "label-xlarge", + "label-large", + "label-medium", + "label-small" +] + export const screenSize = [ "mobile", "tablet", @@ -288,17 +295,24 @@ Since only [headings](#headings), [display headings](#display-headings) and `str { - textLevel.map((level) => ( + [ ...textLevel, ...labelLevel].map((level) => ( {level === 'body-large' && (<>Body large ({'.lead'}))} {level === 'body-medium' && (<>Body medium (default {'

'}))} {level === 'body-small' && (<>Body small ({'.small'} or {''}))} + {level === 'label-xlarge' && (<>Label xlarge ({'.fs-lxl'}))} + {level === 'label-large' && (<>Label large ({'.fs-ll'}))} + {level === 'label-medium' && (<>Label medium ({'.fs-lm'}))} + {level === 'label-small' && (<>Label small ({'.fs-ls'}))} { screenSize.map((size) => ( - {(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem ({getTokenValue(`$ouds-font-size-${level}-${size}`)}) + {!level.includes('label-') + && (<>{(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem ({getTokenValue(`$ouds-font-size-${level}-${size}`)}))} + {level.includes('label-') + && (<>{(getTokenValue(`$ouds-font-size-${level}`).slice(0, -2)) / 16}rem ({getTokenValue(`$ouds-font-size-${level}`)}))} )) } @@ -323,21 +337,26 @@ Since only [headings](#headings), [display headings](#display-headings) and `str { - textLevel.map((level) => ( + [ ...textLevel, ...labelLevel].map((level) => ( {level === 'body-large' && (<>Body large ({'.lead'}))} {level === 'body-medium' && (<>Body medium (default {'

'}))} {level === 'body-small' && (<>Body small ({'.small'} or {''}))} + {level === 'label-xlarge' && (<>Label xlarge ({'.fs-lxl'}))} + {level === 'label-large' && (<>Label large ({'.fs-ll'}))} + {level === 'label-medium' && (<>Label medium ({'.fs-lm'}))} + {level === 'label-small' && (<>Label small ({'.fs-ls'}))} { screenSize.map((size) => (

)) diff --git a/site/src/content/docs/getting-started/migration.mdx b/site/src/content/docs/getting-started/migration.mdx index f4ab1679a3..45b2b5e5e5 100644 --- a/site/src/content/docs/getting-started/migration.mdx +++ b/site/src/content/docs/getting-started/migration.mdx @@ -55,6 +55,12 @@ toc: true - Warning `.shadow-default` has been deprecated in favor of `.shadow-elevated`. It will be removed in v1.5.0. Read more in our [shadow page]([[docsref:/utilities/shadow]]). +#### Text + +- New Labels have been added to font size text utilities : `.fs-lxl`, `.fs-ll`, `.fs-lm`, `.fs-ls` are now available. +See [Regular Texts]([[docsref:foundation/typography#regular-texts]]) for more details. + + ### CSS and Sass variables -
diff --git a/site/src/content/docs/utilities/text.mdx b/site/src/content/docs/utilities/text.mdx index c992ab7011..cc490eaaca 100644 --- a/site/src/content/docs/utilities/text.mdx +++ b/site/src/content/docs/utilities/text.mdx @@ -19,7 +19,11 @@ export const fontSize = [ "body-large", "body-medium", "body-small", - "code-medium" + "code-medium", + "label-xlarge", + "label-large", + "label-medium", + "label-small" ] export const screenSize = [ @@ -140,13 +144,17 @@ These classes change the `font-size` but also the `line-height`, the `letter-spa {level === 'body-medium' && (<>Body medium ({'.fs-bm'}))} {level === 'body-small' && (<>Body small ({'.fs-bs'}))} {level === 'code-medium' && (<>Code medium ({'.fs-cm'}))} + {level === 'label-xlarge' && (<>Label xlarge ({'.fs-lxl'}))} + {level === 'label-large' && (<>Label large ({'.fs-ll'}))} + {level === 'label-medium' && (<>Label medium ({'.fs-lm'}))} + {level === 'label-small' && (<>Label small ({'.fs-ls'}))} { screenSize.map((size) => ( - {level !== 'code-medium' + {(level !== 'code-medium' && !level.includes('label-')) && (<>{(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem ({getTokenValue(`$ouds-font-size-${level}-${size}`)}))} - {level === 'code-medium' + {(level === 'code-medium' || level.includes('label-')) && (<>{(getTokenValue(`$ouds-font-size-${level}`).slice(0, -2)) / 16}rem ({getTokenValue(`$ouds-font-size-${level}`)}))} )) @@ -188,11 +196,15 @@ These classes change the `font-size` but also the `line-height`, the `letter-spa {level === 'body-medium' && (<>Body medium ({'.fs-bm'}))} {level === 'body-small' && (<>Body small ({'.fs-bs'}))} {level === 'code-medium' && (<>Code medium ({'.fs-cm'}))} + {level === 'label-xlarge' && (<>Label xlarge ({'.fs-lxl'}))} + {level === 'label-large' && (<>Label large ({'.fs-ll'}))} + {level === 'label-medium' && (<>Label medium ({'.fs-lm'}))} + {level === 'label-small' && (<>Label small ({'.fs-ls'}))} { screenSize.map((size) => ( - {level !== 'code-medium' + {(level !== 'code-medium' && !level.includes('label-')) && (
  • font-size: {(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem
  • @@ -201,7 +213,7 @@ These classes change the `font-size` but also the `line-height`, the `letter-spa
  • max-width: {(getTokenValue(`$ouds-size-max-width-${level}-${size}`).slice(0, -2)) / 16}rem
)} - {level === 'code-medium' + {(level === 'code-medium' || level.includes('label-')) && (
  • font-size: {(getTokenValue(`$ouds-font-size-${level}`).slice(0, -2)) / 16}rem
  • @@ -230,7 +242,11 @@ These classes change the `font-size` but also the `line-height`, the `letter-spa

    .fs-bl text

    .fs-bm text

    .fs-bs text

    -

    .fs-cm.font-monospace text

    `} /> +

    .fs-cm.font-monospace text

    +

    .fs-lxl text

    +

    .fs-ll text

    +

    .fs-lm text

    +

    .fs-ls text

    `} /> Customize your available `font-size`s by modifying the `$ouds-font-sizes` Sass map.