From 193b7862d636dc2a67365ff85a5538d8b8a843d0 Mon Sep 17 00:00:00 2001 From: cchaos Date: Mon, 18 Mar 2019 13:45:22 -0400 Subject: [PATCH 1/3] Fix heading font reset and button inherited font size --- src/components/button/_mixins.scss | 1 + src/global_styling/reset/_reset.scss | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/button/_mixins.scss b/src/components/button/_mixins.scss index 05d817c73cf..e86f468a6aa 100644 --- a/src/components/button/_mixins.scss +++ b/src/components/button/_mixins.scss @@ -1,5 +1,6 @@ @mixin euiButton { @include euiFont; + @include euiFontSize; display: inline-block; appearance: none; diff --git a/src/global_styling/reset/_reset.scss b/src/global_styling/reset/_reset.scss index c08fbb1e313..516166e0517 100644 --- a/src/global_styling/reset/_reset.scss +++ b/src/global_styling/reset/_reset.scss @@ -29,12 +29,15 @@ time, mark, audio, video { vertical-align: baseline; } -code, pre { +code, pre, kbd, samp { font-family: $euiCodeFontFamily; } +h1, h2, h3, h4, h5, h6, p, input, textarea, select, button { font-family: $euiFontFamily; + font-weight: $euiFontWeightRegular; + font-size: $euiFontSize; } em { @@ -96,7 +99,6 @@ button { padding: 0; margin: 0; outline: none; - font-size: $euiFontSize; font-size: inherit; color: inherit; border-radius: 0; From 2e0c42823b5366eff13da76181577e1aa745538c Mon Sep 17 00:00:00 2001 From: cchaos Date: Fri, 22 Mar 2019 10:48:27 -0400 Subject: [PATCH 2/3] Fix reset --- src/global_styling/reset/_reset.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/global_styling/reset/_reset.scss b/src/global_styling/reset/_reset.scss index 516166e0517..626c71bf268 100644 --- a/src/global_styling/reset/_reset.scss +++ b/src/global_styling/reset/_reset.scss @@ -33,13 +33,16 @@ code, pre, kbd, samp { font-family: $euiCodeFontFamily; } -h1, h2, h3, h4, h5, h6, p, -input, textarea, select, button { +h1, h2, h3, h4, h5, h6, p { font-family: $euiFontFamily; font-weight: $euiFontWeightRegular; font-size: $euiFontSize; } +input, textarea, select, button { + font-family: $euiFontFamily; +} + em { font-style: italic; } From 6adee01a26f750f642957fe7cdcb9a0290b3fbfa Mon Sep 17 00:00:00 2001 From: cchaos Date: Fri, 22 Mar 2019 11:07:11 -0400 Subject: [PATCH 3/3] cl --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a9a610820c..c4de6571bbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ - Converted `EuiCardGraphic` to TS ([#1751](https://github.com/elastic/eui/pull/1751)) - Enhanced the build process to emit TypeScript types for the variables extracted from the themes ([#1750](https://github.com/elastic/eui/pull/1750)) +**Bug fixes** + +- Set `h1 through h6, p` tags font reset based on family, size, and weight ([#1760](https://github.com/elastic/eui/pull/1760)) +- Fixed `EuiButton` font size inheritence ([#1760](https://github.com/elastic/eui/pull/1760)) + ## [`9.5.0`](https://github.com/elastic/eui/tree/v9.5.0) - Changed `EuiSuperDatePicker` to call `onRefresh` instead of `onTimeChanged` when user clicks "Refresh" button ([#1745](https://github.com/elastic/eui/pull/1745)) @@ -12,7 +17,7 @@ **Bug fixes** -- Fixed `EuiToolTip` potentially having incorrect position calculations near the window edge ([#1744](https://github.com/elastic/eui/pull/1744)) +- Fixed `EuiToolTip` potentially having incorrect position calculations near the window edge ([#1744](https://github.com/elastic/eui/pull/1744)) ## [`9.4.2`](https://github.com/elastic/eui/tree/v9.4.2)