Skip to content

Commit

Permalink
Merge pull request #1062 from lumapps/chore/add-missing-design-token-…
Browse files Browse the repository at this point in the history
…for-font-weight

chore(design-tokens): add font-weight medium
  • Loading branch information
gcornut authored Jan 4, 2024
2 parents 83b1ab2 + 8681dab commit 2ad2250
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- Add new design token `medium` for `font-weight`.

### Fixed

- Tooltip: fixed tooltip closing when mouse is hovering the tooltip text.
Expand Down
3 changes: 2 additions & 1 deletion packages/lumx-core/src/css/design-tokens.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* Do not edit directly
* Generated on Fri, 01 Dec 2023 09:07:37 GMT
* Generated on Thu, 04 Jan 2024 13:59:14 GMT
*/

:root {
Expand Down Expand Up @@ -467,6 +467,7 @@
--lumx-spacing-unit-huge: 24px;
--lumx-typography-font-family: "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Fira Sans", "Droid Sans", "Helvetica Neue", "sans-serif";
--lumx-typography-font-weight-regular: 400;
--lumx-typography-font-weight-medium: 500;
--lumx-typography-font-weight-bold: 700;
--lumx-typography-font-weight-light: 300;
--lumx-typography-interface-display1-font-size: 34px;
Expand Down
9 changes: 7 additions & 2 deletions packages/lumx-core/src/js/constants/design-tokens.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Do not edit directly
* Generated on Fri, 01 Dec 2023 09:07:37 GMT
* Generated on Thu, 04 Jan 2024 13:59:14 GMT
*/

export const DESIGN_TOKENS = {
Expand Down Expand Up @@ -2041,7 +2041,12 @@ export const DESIGN_TOKENS = {
value:
"'-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'sans-serif'",
},
'font-weight': { regular: { value: '400' }, bold: { value: '700' }, light: { value: '300' } },
'font-weight': {
regular: { value: '400' },
medium: { value: '500' },
bold: { value: '700' },
light: { value: '300' },
},
interface: {
display1: {
'font-size': { value: '34px' },
Expand Down
4 changes: 3 additions & 1 deletion packages/lumx-core/src/scss/_design-tokens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* Do not edit directly
* Generated on Fri, 01 Dec 2023 09:07:37 GMT
* Generated on Thu, 04 Jan 2024 13:59:14 GMT
*/

$lumx-button-height: 36px !default;
Expand Down Expand Up @@ -466,6 +466,7 @@ $lumx-spacing-unit-big: 16px !default;
$lumx-spacing-unit-huge: 24px !default;
$lumx-typography-font-family: "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Fira Sans", "Droid Sans", "Helvetica Neue", "sans-serif" !default;
$lumx-typography-font-weight-regular: 400 !default;
$lumx-typography-font-weight-medium: 500 !default;
$lumx-typography-font-weight-bold: 700 !default;
$lumx-typography-font-weight-light: 300 !default;
$lumx-typography-interface-display1-font-size: 34px !default;
Expand Down Expand Up @@ -1514,6 +1515,7 @@ $lumx-design-tokens: (
"font-family": $lumx-typography-font-family,
"font-weight": (
"regular": $lumx-typography-font-weight-regular,
"medium": $lumx-typography-font-weight-medium,
"bold": $lumx-typography-font-weight-bold,
"light": $lumx-typography-font-weight-light
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
},
"font-weight": {
"regular": { "value": "400" },
"medium": { "value": "500" },
"bold": { "value": "700" },
"light": { "value": "300" }
},
Expand Down

0 comments on commit 2ad2250

Please sign in to comment.