Skip to content

[Theme] Fix typography scss order #8922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgadewoll merged 3 commits into from
Jul 31, 2025
Merged

[Theme] Fix typography scss order #8922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0df2b55
refactor: ensure typography variable order
mgadewoll Jul 29, 2025
29c6187
chore: add changelogs
mgadewoll Jul 29, 2025
72e4c72
style: group common imports
mgadewoll Jul 31, 2025
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/eui-theme-borealis/changelogs/upcoming/8922.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**Bug fixes**

- Updated shared theme SCSS imports to ensure expected results for the SCSS function `lineHeightFromBaseline`

5 changes: 3 additions & 2 deletions packages/eui-theme-borealis/src/variables/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
// package instead of the common one

@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/size';
@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/responsive';
@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/typography';

// borders are used in the common package, to define them on theme level we require the size variables first
@import 'borders';
@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/index';
@import 'states';

@import './colors/colors_severity';
@import 'form';
@import 'page';
Expand Down
16 changes: 16 additions & 0 deletions packages/eui-theme-common/changelogs/upcoming/8922.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
**Breaking changes**

- Removed obsolete SCSS typography definitions - use the definitions from the themes directly
- $euiFontFamily
- $euiTextScale
- $euiFontSize
- $euiFontSizeXS
- $euiFontSizeS
- $euiFontSizeM
- $euiFontSizeL
- $euiFontSizeXL
- $euiFontSizeXXL
- $euiBodyLineHeight
- $euiTitles
- convertToRem()
- lineHeightFromBaseline()
69 changes: 1 addition & 68 deletions packages/eui-theme-common/src/global_styling/variables/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,8 @@
// Families
$euiFontFamily: 'Inter', BlinkMacSystemFont, Helvetica, Arial, sans-serif !default;
$euiCodeFontFamily: 'Roboto Mono', Menlo, Courier, monospace !default;

// Careful using ligatures. Code editors like ACE will often error because of width calculations
$euiFontFeatureSettings: 'calt' 1, 'kern' 1, 'liga' 1 !default;

// Font sizes -- scale is loosely based on Major Third (1.250)
$euiTextScale: 2.25, 1.75, 1.25, 1.125, 1, .875, .75 !default;

$euiFontSize: $euiSize !default; // 5th position in scale
$euiFontSizeXS: $euiFontSize * nth($euiTextScale, 7) !default; // 12px
$euiFontSizeS: $euiFontSize * nth($euiTextScale, 6) !default; // 14px
$euiFontSizeM: $euiFontSize * nth($euiTextScale, 4) !default; // 18px
$euiFontSizeL: $euiFontSize * nth($euiTextScale, 3) !default; // 20px
$euiFontSizeXL: $euiFontSize * nth($euiTextScale, 2) !default; // 28px
$euiFontSizeXXL: $euiFontSize * nth($euiTextScale, 1) !default; // 36px

// Line height
$euiLineHeight: 1.5 !default;
$euiBodyLineHeight: 1 !default;

// Normally functions are imported before variables in `_index.scss` files
// But because they need to consume some typography variables they need to live here
@function convertToRem($size) {
@return #{$size / $euiFontSize}rem;
}

// Our base gridline is at 1/2 the font-size, ensure line-heights stay on that gridline.
// EX: A proper line-height for text is 1.5 times the font-size.
// If our base font size (euiFontSize) is 16, our baseline is 8 (16*1.5 / 3). To ensure the
// text stays on the baseline, we pass a multiplier to calculate a line-height in rems.
@function lineHeightFromBaseline($multiplier: 3) {
@return convertToRem(($euiFontSize / 2) * $multiplier);
}

// Titles map
// Lists all the properties per EuiTitle size that then gets looped through to create the selectors.
// The map allows for tokenization and easier customization per theme, otherwise you'd have to override the selectors themselves
$euiTitles: (
'xxxs': (
'font-size': $euiFontSizeXS,
'line-height': lineHeightFromBaseline(3),
'font-weight': $euiFontWeightBold,
),
'xxs': (
'font-size': $euiFontSizeS,
'line-height': lineHeightFromBaseline(3),
'font-weight': $euiFontWeightBold,
),
'xs': (
'font-size': $euiFontSize,
'line-height': lineHeightFromBaseline(3),
'font-weight': $euiFontWeightSemiBold,
'letter-spacing': -.02em,
),
's': (
'font-size': $euiFontSizeL,
'line-height': lineHeightFromBaseline(4),
'font-weight': $euiFontWeightMedium,
'letter-spacing': -.025em,
),
'm': (
'font-size': $euiFontSizeXL,
'line-height': lineHeightFromBaseline(5),
'font-weight': $euiFontWeightLight,
'letter-spacing': -.04em,
),
'l': (
'font-size': $euiFontSizeXXL,
'line-height': lineHeightFromBaseline(6),
'font-weight': $euiFontWeightLight,
'letter-spacing': -.03em,
),
) !default;
$euiLineHeight: 1.5 !default;
4 changes: 4 additions & 0 deletions packages/eui/changelogs/upcoming/8922.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**Bug fixes**

- Fixed unexpected results for the SCSS function `lineHeightFromBaseline`