Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions .bundlewatch.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
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);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We decided to not generate a max-width property for label ref since it was often not needed in components. Therefore get-font-size mixin doesn't generate the max-width for this ref. As a result we don't have it either in these helpers. But I think that it should be present in this case for this usage.

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 (<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>
<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 (<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>
<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
6 changes: 6 additions & 0 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 @@ -55,6 +55,12 @@ toc: true

- <span class="tag tag-small tag-warning"><span class="tag-status-icon"></span>Warning</span> `.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

- <span class="tag tag-small tag-positive"><span class="tag-status-icon"></span>New</span> 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.
Comment on lines +60 to +61

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to have the same phrasing as the others

Suggested change
- <span class="tag tag-small tag-positive"><span class="tag-status-icon"></span>New</span> 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.
- <span class="tag tag-small tag-positive"><span class="tag-status-icon"></span>New</span> Labels have been added to font size text utilities : `.fs-lxl`, `.fs-ll`, `.fs-lm`, `.fs-ls` are now available. Read more in our [typography page]([[docsref:foundation/typography#regular-texts]]).



### CSS and Sass variables

- <details class="mb-small">
Expand Down
28 changes: 22 additions & 6 deletions site/src/content/docs/utilities/text.mdx

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a section at the end of https://deploy-preview-3621--boosted.netlify.app/orange/docs/1.3/foundation/typography/#text-style-for-custom-components explaining how to use label typography references in custom component. This section could be removed since there is now a helper that could be used. The documentation of this mixin is still relevant but it could be explained later in a page we want to create about all useful mixin for creating components.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue already open #3423

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