Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 4 additions & 0 deletions packages/orange-compact/scss/tokens/_semantic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,10 @@ $ouds-font-size-body-small-desktop: $core-ouds-font-size-175 !default;
$ouds-font-size-body-small-mobile: $core-ouds-font-size-150 !default;
$ouds-font-size-body-small-tablet: $core-ouds-font-size-150 !default;
$ouds-font-size-code-medium: $core-ouds-font-size-200 !default;
$ouds-font-size-label-xlarge: $core-ouds-font-size-300 !default;
$ouds-font-size-label-large: $core-ouds-font-size-250 !default;
$ouds-font-size-label-medium: $core-ouds-font-size-200 !default;
$ouds-font-size-label-small: $core-ouds-font-size-150 !default;
Comment thread
Copilot marked this conversation as resolved.
Outdated
$ouds-font-size-display-large-desktop: $core-ouds-font-size-850 !default;
$ouds-font-size-display-large-mobile: $core-ouds-font-size-750 !default;
$ouds-font-size-display-large-tablet: $core-ouds-font-size-750 !default;
Expand Down
6 changes: 5 additions & 1 deletion packages/orange/scss/tokens/_semantic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -396,10 +396,10 @@ $ouds-font-letter-spacing-heading-small-tablet: $core-ouds-font-letter-spacing-3
$ouds-font-letter-spacing-heading-xlarge-desktop: $core-ouds-font-letter-spacing-850 !default;
$ouds-font-letter-spacing-heading-xlarge-mobile: $core-ouds-font-letter-spacing-550 !default;
$ouds-font-letter-spacing-heading-xlarge-tablet: $core-ouds-font-letter-spacing-750 !default;
$ouds-font-letter-spacing-label-xlarge: $core-ouds-font-letter-spacing-300 !default;
$ouds-font-letter-spacing-label-large: $core-ouds-font-letter-spacing-250 !default;
$ouds-font-letter-spacing-label-medium: $core-ouds-font-letter-spacing-200 !default;
$ouds-font-letter-spacing-label-small: $core-ouds-font-letter-spacing-150 !default;
$ouds-font-letter-spacing-label-xlarge: $core-ouds-font-letter-spacing-300 !default;
$ouds-font-line-height-body-large-desktop: $core-ouds-font-line-height-450 !default;
$ouds-font-line-height-body-large-mobile: $core-ouds-font-line-height-450 !default;
$ouds-font-line-height-body-large-tablet: $core-ouds-font-line-height-450 !default;
Expand All @@ -410,6 +410,10 @@ $ouds-font-line-height-body-small-desktop: $core-ouds-font-line-height-350 !defa
$ouds-font-line-height-body-small-mobile: $core-ouds-font-line-height-250 !default;
$ouds-font-line-height-body-small-tablet: $core-ouds-font-line-height-250 !default;
$ouds-font-line-height-code-medium: $core-ouds-font-line-height-350 !default;
$ouds-font-line-height-label-xlarge: $core-ouds-font-line-height-450 !default;
$ouds-font-line-height-label-large: $core-ouds-font-line-height-450 !default;
$ouds-font-line-height-label-medium: $core-ouds-font-line-height-350 !default;
$ouds-font-line-height-label-small: $core-ouds-font-line-height-250 !default;
Comment thread
Copilot marked this conversation as resolved.
Outdated
$ouds-font-line-height-display-large-desktop: $core-ouds-font-line-height-2050 !default;
$ouds-font-line-height-display-large-mobile: $core-ouds-font-line-height-1050 !default;
$ouds-font-line-height-display-large-tablet: $core-ouds-font-line-height-1850 !default;
Expand Down
4 changes: 4 additions & 0 deletions packages/sosh/scss/tokens/_semantic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,10 @@ $ouds-font-size-body-small-desktop: $core-ouds-font-size-200 !default;
$ouds-font-size-body-small-mobile: $core-ouds-font-size-150 !default;
$ouds-font-size-body-small-tablet: $core-ouds-font-size-150 !default;
$ouds-font-size-code-medium: $core-ouds-font-size-200 !default;
$ouds-font-size-label-xlarge: $core-ouds-font-size-300 !default;
$ouds-font-size-label-large: $core-ouds-font-size-250 !default;
$ouds-font-size-label-medium: $core-ouds-font-size-200 !default;
$ouds-font-size-label-small: $core-ouds-font-size-150 !default;
Comment thread
Copilot marked this conversation as resolved.
Outdated
$ouds-font-size-display-large-desktop: $core-ouds-font-size-1850 !default;
$ouds-font-size-display-large-mobile: $core-ouds-font-size-850 !default;
$ouds-font-size-display-large-tablet: $core-ouds-font-size-1450 !default;
Expand Down
4 changes: 4 additions & 0 deletions scss/_maps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
64 changes: 64 additions & 0 deletions scss/tests/customize/_ouds-web-bootstrap-utilities.test.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3508,6 +3508,38 @@ $utilities: ();

/* rtl:end:remove */

.fs-lxl {
font-size: var(--bs-font-size-label-xlarge);
Comment thread
MaxLardenois marked this conversation as resolved.
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);
Expand Down Expand Up @@ -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);
Expand Down
33 changes: 26 additions & 7 deletions site/src/content/docs/foundation/typography.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -288,17 +295,24 @@ Since only [headings](#headings), [display headings](#display-headings) and `str
</thead>
<tbody>
{
textLevel.map((level) => (
[ ...textLevel, ...labelLevel].map((level) => (
<tr>
<td>
{level === 'body-large' && (<>Body large (<code>{'.lead'}</code>)</>)}
{level === 'body-medium' && (<>Body medium (default <code>{'<p>'}</code>)</>)}
{level === 'body-small' && (<>Body small (<code>{'.small'}</code> or <code>{'<small>'}</code>)</>)}
{level === 'label-xlarge' && (<>Label xlarge</>)}
{level === 'label-large' && (<>Label large</>)}
{level === 'label-medium' && (<>Label medium</>)}
{level === 'label-small' && (<>Label small</>)}
Comment thread
louismaximepiton marked this conversation as resolved.
Outdated
</td>
{
screenSize.map((size) => (
<td>
<code>{(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem</code> ({getTokenValue(`$ouds-font-size-${level}-${size}`)})
{!level.includes('label-')
&& (<><code>{(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem</code> ({getTokenValue(`$ouds-font-size-${level}-${size}`)})</>)}
{level.includes('label-')
&& (<><code>{(getTokenValue(`$ouds-font-size-${level}`).slice(0, -2)) / 16}rem</code> ({getTokenValue(`$ouds-font-size-${level}`)})</>)}
</td>
))
}
Expand All @@ -323,21 +337,26 @@ Since only [headings](#headings), [display headings](#display-headings) and `str
</thead>
<tbody>
{
textLevel.map((level) => (
[ ...textLevel, ...labelLevel].map((level) => (
<tr>
<td>
{level === 'body-large' && (<>Body large (<code>{'.lead'}</code>)</>)}
{level === 'body-medium' && (<>Body medium (default <code>{'<p>'}</code>)</>)}
{level === 'body-small' && (<>Body small (<code>{'.small'}</code> or <code>{'<small>'}</code>)</>)}
{level === 'label-xlarge' && (<>Label xlarge</>)}
{level === 'label-large' && (<>Label large</>)}
{level === 'label-medium' && (<>Label medium</>)}
{level === 'label-small' && (<>Label small</>)}
</td>
{
screenSize.map((size) => (
<td>
<ul class="mb-none ps-medium">
<li><code class="text-default">font-size</code>: <b>{(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem</b></li>
<li><code>line-height</code>: {Math.round(((getTokenValue(`$ouds-font-line-height-${level}-${size}`).slice(0, -2)) / (getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2))) * 10000) / 10000}</li>
<li><code>letter-spacing</code>: {(getTokenValue(`$ouds-font-letter-spacing-${level}-${size}`).slice(0, -2)) / 16}rem</li>
<li><code>max-width</code>: {(getTokenValue(`$ouds-size-max-width-${level}-${size}`).slice(0, -2)) / 16}rem</li>
<li><code class="text-default">font-size</code>: <b>{(getTokenValue(`$ouds-font-size-${level}${!level.includes('label-') ? '-' + size : ''}`).slice(0, -2)) / 16}rem</b></li>
<li><code>line-height</code>: {Math.round(((getTokenValue(`$ouds-font-line-height-${level}${!level.includes('label-') ? '-' + size : ''}`).slice(0, -2)) / (getTokenValue(`$ouds-font-size-${level}${!level.includes('label-') ? '-' + size : ''}`).slice(0, -2))) * 10000) / 10000}</li>
<li><code>letter-spacing</code>: {(getTokenValue(`$ouds-font-letter-spacing-${level}${!level.includes('label-') ? '-' + size : ''}`).slice(0, -2)) / 16}rem</li>
{!level.includes('label-')
&& (<li><code>max-width</code>: {(getTokenValue(`$ouds-size-max-width-${level}-${size}`).slice(0, -2)) / 16}rem</li>)}
</ul>
</td>
))
Expand Down
Comment thread
louismaximepiton marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -1483,10 +1483,10 @@ See [our new Text Area page]([[docsref:/components/text-area]]) for more informa
<li><code>$ouds-font-line-height-heading-xlarge-desktop</code></li>
<li><code>$ouds-font-line-height-heading-xlarge-mobile</code></li>
<li><code>$ouds-font-line-height-heading-xlarge-tablet</code></li>
<li><code>$ouds-font-line-height-label-xlarge</code></li>
<li><code>$ouds-font-line-height-label-large</code></li>
<li><code>$ouds-font-line-height-label-medium</code></li>
<li><code>$ouds-font-line-height-label-small</code></li>
<li><code>$ouds-font-line-height-label-xlarge</code></li>
<li><code>$ouds-font-size-body-large-desktop</code></li>
<li><code>$ouds-font-size-body-large-mobile</code></li>
<li><code>$ouds-font-size-body-large-tablet</code></li>
Expand Down Expand Up @@ -1518,10 +1518,10 @@ See [our new Text Area page]([[docsref:/components/text-area]]) for more informa
<li><code>$ouds-font-size-heading-xlarge-desktop</code></li>
<li><code>$ouds-font-size-heading-xlarge-mobile</code></li>
<li><code>$ouds-font-size-heading-xlarge-tablet</code></li>
<li><code>$ouds-font-size-label-xlarge</code></li>
<li><code>$ouds-font-size-label-large</code></li>
<li><code>$ouds-font-size-label-medium</code></li>
<li><code>$ouds-font-size-label-small</code></li>
<li><code>$ouds-font-size-label-xlarge</code></li>
<li><code>$ouds-font-weight-system-web-default</code></li>
<li><code>$ouds-font-weight-system-web-strong</code></li>
<li><code>$ouds-font-weight-web-body-default</code></li>
Expand Down
4 changes: 2 additions & 2 deletions site/src/content/docs/getting-started/migration.mdx
Comment thread
louismaximepiton marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -1681,10 +1681,10 @@ toc: true
<li><code>$ouds-font-line-height-heading-xlarge-desktop</code></li>
<li><code>$ouds-font-line-height-heading-xlarge-mobile</code></li>
<li><code>$ouds-font-line-height-heading-xlarge-tablet</code></li>
<li><code>$ouds-font-line-height-label-xlarge</code></li>
<li><code>$ouds-font-line-height-label-large</code></li>
<li><code>$ouds-font-line-height-label-medium</code></li>
<li><code>$ouds-font-line-height-label-small</code></li>
<li><code>$ouds-font-line-height-label-xlarge</code></li>
<li><code>$ouds-font-size-150</code></li>
<li><code>$ouds-font-size-200</code></li>
<li><code>$ouds-font-size-250</code></li>
Expand Down Expand Up @@ -1730,10 +1730,10 @@ toc: true
<li><code>$ouds-font-size-heading-xlarge-desktop</code></li>
<li><code>$ouds-font-size-heading-xlarge-mobile</code></li>
<li><code>$ouds-font-size-heading-xlarge-tablet</code></li>
<li><code>$ouds-font-size-label-xlarge</code></li>
<li><code>$ouds-font-size-label-large</code></li>
<li><code>$ouds-font-size-label-medium</code></li>
<li><code>$ouds-font-size-label-small</code></li>
<li><code>$ouds-font-size-label-xlarge</code></li>
<li><code>$ouds-font-weight-400</code></li>
<li><code>$ouds-font-weight-700</code></li>
<li><code>$ouds-font-weight-body-default</code></li>
Expand Down
28 changes: 22 additions & 6 deletions site/src/content/docs/utilities/text.mdx
Comment thread
MaxLardenois marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -140,13 +144,17 @@ These classes change the `font-size` but also the `line-height`, the `letter-spa
{level === 'body-medium' && (<>Body medium (<code>{'.fs-bm'}</code>)</>)}
{level === 'body-small' && (<>Body small (<code>{'.fs-bs'}</code>)</>)}
{level === 'code-medium' && (<>Code medium (<code>{'.fs-cm'}</code>)</>)}
{level === 'label-xlarge' && (<>Label xlarge (<code>{'.fs-lxl'}</code>)</>)}
{level === 'label-large' && (<>Label large (<code>{'.fs-ll'}</code>)</>)}
{level === 'label-medium' && (<>Label medium (<code>{'.fs-lm'}</code>)</>)}
{level === 'label-small' && (<>Label small (<code>{'.fs-ls'}</code>)</>)}
</td>
{
screenSize.map((size) => (
<td>
{level !== 'code-medium'
{(level !== 'code-medium' && !level.includes('label-'))
&& (<><code>{(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem</code> ({getTokenValue(`$ouds-font-size-${level}-${size}`)})</>)}
{level === 'code-medium'
{(level === 'code-medium' || level.includes('label-'))
&& (<><code>{(getTokenValue(`$ouds-font-size-${level}`).slice(0, -2)) / 16}rem</code> ({getTokenValue(`$ouds-font-size-${level}`)})</>)}
</td>
))
Expand Down Expand Up @@ -188,11 +196,15 @@ These classes change the `font-size` but also the `line-height`, the `letter-spa
{level === 'body-medium' && (<>Body medium (<code>{'.fs-bm'}</code>)</>)}
{level === 'body-small' && (<>Body small (<code>{'.fs-bs'}</code>)</>)}
{level === 'code-medium' && (<>Code medium (<code>{'.fs-cm'}</code>)</>)}
{level === 'label-xlarge' && (<>Label xlarge (<code>{'.fs-lxl'}</code>)</>)}
{level === 'label-large' && (<>Label large (<code>{'.fs-ll'}</code>)</>)}
{level === 'label-medium' && (<>Label medium (<code>{'.fs-lm'}</code>)</>)}
{level === 'label-small' && (<>Label small (<code>{'.fs-ls'}</code>)</>)}
</td>
{
screenSize.map((size) => (
<td>
{level !== 'code-medium'
{(level !== 'code-medium' && !level.includes('label-'))
&& (
<ul class="mb-none ps-medium">
<li><code class="text-default">font-size</code>: <b>{(getTokenValue(`$ouds-font-size-${level}-${size}`).slice(0, -2)) / 16}rem</b></li>
Expand All @@ -201,7 +213,7 @@ These classes change the `font-size` but also the `line-height`, the `letter-spa
<li><code>max-width</code>: {(getTokenValue(`$ouds-size-max-width-${level}-${size}`).slice(0, -2)) / 16}rem</li>
</ul>
)}
{level === 'code-medium'
{(level === 'code-medium' || level.includes('label-'))
&& (
<ul class="mb-none ps-medium">
<li><code class="text-default">font-size</code>: <b>{(getTokenValue(`$ouds-font-size-${level}`).slice(0, -2)) / 16}rem</b></li>
Expand Down Expand Up @@ -230,7 +242,11 @@ These classes change the `font-size` but also the `line-height`, the `letter-spa
<p class="fs-bl">.fs-bl text</p>
<p class="fs-bm">.fs-bm text</p>
<p class="fs-bs">.fs-bs text</p>
<p class="fs-cm font-monospace">.fs-cm.font-monospace text</p>`} />
<p class="fs-cm font-monospace">.fs-cm.font-monospace text</p>
<p class="fs-lxl">.fs-lxl text</p>
<p class="fs-ll">.fs-ll text</p>
<p class="fs-lm">.fs-lm text</p>
<p class="fs-ls">.fs-ls text</p>`} />

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

Expand Down
Loading