From fe8e2a0019a28820ed19aacc14789b1b3d91ad22 Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Thu, 24 Sep 2020 14:35:00 -0400 Subject: [PATCH 1/5] fix baseline to be 8px --- .../eui-amsterdam/global_styling/variables/_typography.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/themes/eui-amsterdam/global_styling/variables/_typography.scss b/src/themes/eui-amsterdam/global_styling/variables/_typography.scss index 8e9a49ade77..e05a28c5b09 100644 --- a/src/themes/eui-amsterdam/global_styling/variables/_typography.scss +++ b/src/themes/eui-amsterdam/global_styling/variables/_typography.scss @@ -14,6 +14,11 @@ $euiFontSizeL: ceil($euiFontSize * 1.57); // 22px // h3 $euiFontSizeXL: floor($euiFontSize * 1.93); // 27px // h2 $euiFontSizeXXL: floor($euiFontSize * 2.43); // 34px // h1 +// Use 8px incrememnts for base gridline +@function lineHeightFromBaseline($multiplier: 3) { + @return convertToRem(($euiSize/2)*$multiplier); +} + $euiTitles: ( 'xxxs': ( 'font-size': $euiFontSizeXS, From 25597c1d93dcc7d2e59cb25333fe999f7d47ca33 Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Thu, 24 Sep 2020 19:13:59 -0400 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04badd343de..8063b3b3e4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ No public interface changes since `29.2.0`. - Removed `border-radius` from `EuiCallout` ([#4066](https://github.com/elastic/eui/pull/4066)) - Updated styles for `EuiToast` ([#4076](https://github.com/elastic/eui/pull/4076)) +- Fixed `line-height` on `EuiTitle` ([#4079](https://github.com/elastic/eui/pull/4079)) ## [`29.1.0`](https://github.com/elastic/eui/tree/v29.1.0) From f3a4128b6ced4688abc377442a8ef70912d8a6f6 Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Mon, 28 Sep 2020 21:58:48 -0400 Subject: [PATCH 3/5] Update src/themes/eui-amsterdam/global_styling/variables/_typography.scss Co-authored-by: Caroline Horn <549577+cchaos@users.noreply.github.com> --- .../eui-amsterdam/global_styling/variables/_typography.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/eui-amsterdam/global_styling/variables/_typography.scss b/src/themes/eui-amsterdam/global_styling/variables/_typography.scss index e05a28c5b09..25e01813bf9 100644 --- a/src/themes/eui-amsterdam/global_styling/variables/_typography.scss +++ b/src/themes/eui-amsterdam/global_styling/variables/_typography.scss @@ -14,7 +14,7 @@ $euiFontSizeL: ceil($euiFontSize * 1.57); // 22px // h3 $euiFontSizeXL: floor($euiFontSize * 1.93); // 27px // h2 $euiFontSizeXXL: floor($euiFontSize * 2.43); // 34px // h1 -// Use 8px incrememnts for base gridline +// Use 8px increments for base gridline @function lineHeightFromBaseline($multiplier: 3) { @return convertToRem(($euiSize/2)*$multiplier); } From 72818ab2a8946010649c77b675efc258995c3ac2 Mon Sep 17 00:00:00 2001 From: Caroline Horn <549577+cchaos@users.noreply.github.com> Date: Wed, 30 Sep 2020 10:14:05 -0400 Subject: [PATCH 4/5] Creating a conflict to merge upstream --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8063b3b3e4f..744bd5ffcba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ No public interface changes since `29.2.0`. **Theme: Amsterdam** - Removed `border-radius` from `EuiCallout` ([#4066](https://github.com/elastic/eui/pull/4066)) -- Updated styles for `EuiToast` ([#4076](https://github.com/elastic/eui/pull/4076)) +- Updarted styles for `EuiToast` ([#4076](https://github.com/elastic/eui/pull/4076)) - Fixed `line-height` on `EuiTitle` ([#4079](https://github.com/elastic/eui/pull/4079)) ## [`29.1.0`](https://github.com/elastic/eui/tree/v29.1.0) From 9e6bdbee9adcf83c7430b2e2ef50d608c397873a Mon Sep 17 00:00:00 2001 From: cchaos Date: Wed, 30 Sep 2020 10:17:03 -0400 Subject: [PATCH 5/5] cl --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 744bd5ffcba..2e93b4397e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## [`master`](https://github.com/elastic/eui/tree/master) -No public interface changes since `29.2.0`. +**Theme: Amsterdam** + +- Fixed `line-height` on `EuiTitle` ([#4079](https://github.com/elastic/eui/pull/4079)) ## [`29.2.0`](https://github.com/elastic/eui/tree/v29.2.0) @@ -10,8 +12,7 @@ No public interface changes since `29.2.0`. **Theme: Amsterdam** - Removed `border-radius` from `EuiCallout` ([#4066](https://github.com/elastic/eui/pull/4066)) -- Updarted styles for `EuiToast` ([#4076](https://github.com/elastic/eui/pull/4076)) -- Fixed `line-height` on `EuiTitle` ([#4079](https://github.com/elastic/eui/pull/4079)) +- Updated styles for `EuiToast` ([#4076](https://github.com/elastic/eui/pull/4076)) ## [`29.1.0`](https://github.com/elastic/eui/tree/v29.1.0)