From 753afa7832c7af9087741d7c58ec0673418ce58d Mon Sep 17 00:00:00 2001 From: cchaos Date: Mon, 23 Apr 2018 16:08:33 -0400 Subject: [PATCH 1/5] Fix inherited line-height of inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `line-height: inherited` from reset.scss was making inputs get their line-height from their container, which we really only want it to remain “normal” --- src/components/form/_mixins.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/form/_mixins.scss b/src/components/form/_mixins.scss index 8573cbe79e3..f0004696c2e 100644 --- a/src/components/form/_mixins.scss +++ b/src/components/form/_mixins.scss @@ -75,6 +75,7 @@ border: none; font-size: $euiFontSizeS; font-family: $euiFontFamily; + line-height: normal; padding: $euiSizeM; color: $euiTextColor; background: $euiFormBackgroundColor; From 81f34f3bb7295382228de4d686dca5675d04768f Mon Sep 17 00:00:00 2001 From: cchaos Date: Wed, 25 Apr 2018 16:49:10 -0400 Subject: [PATCH 2/5] Only resetting font-family to inherit on these special elements --- src/global_styling/reset/_reset.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/global_styling/reset/_reset.scss b/src/global_styling/reset/_reset.scss index ac5ee5a7052..62467ca549e 100644 --- a/src/global_styling/reset/_reset.scss +++ b/src/global_styling/reset/_reset.scss @@ -21,7 +21,6 @@ small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, -input, textarea, select, button, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, @@ -35,6 +34,10 @@ time, mark, audio, video { vertical-align: baseline; } +input, textarea, select, button { + font-family: inherit; /* 1 */ +} + em { font-style: italic; } From 4970f395380241b4ae161f76410442287e86c2d0 Mon Sep 17 00:00:00 2001 From: cchaos Date: Wed, 25 Apr 2018 16:54:13 -0400 Subject: [PATCH 3/5] changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a51a5b7277e..7da5d4af268 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## [`master`](https://github.com/elastic/eui/tree/master) -No public interface changes since `0.0.43`. +**Bug fixes** + +- Fix inherited `line-height` of inputs and buttons ([#702](https://github.com/elastic/eui/pull/702)) ## [`0.0.43`](https://github.com/elastic/eui/tree/v0.0.43) From 06c1cf6a89b7d9b29a6282fb6dee70d3cc530e3a Mon Sep 17 00:00:00 2001 From: cchaos Date: Wed, 25 Apr 2018 16:54:58 -0400 Subject: [PATCH 4/5] Past tense --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7da5d4af268..74af590da33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ **Bug fixes** -- Fix inherited `line-height` of inputs and buttons ([#702](https://github.com/elastic/eui/pull/702)) +- Fixed inherited `line-height` of inputs and buttons ([#702](https://github.com/elastic/eui/pull/702)) ## [`0.0.43`](https://github.com/elastic/eui/tree/v0.0.43) From a596d5f0b4417b60cca3c8a3e052866935911c82 Mon Sep 17 00:00:00 2001 From: Caroline Horn <549577+cchaos@users.noreply.github.com> Date: Wed, 25 Apr 2018 16:59:51 -0400 Subject: [PATCH 5/5] remove line-height Was the original fix, but changes reset instead --- src/components/form/_mixins.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/form/_mixins.scss b/src/components/form/_mixins.scss index f0004696c2e..8573cbe79e3 100644 --- a/src/components/form/_mixins.scss +++ b/src/components/form/_mixins.scss @@ -75,7 +75,6 @@ border: none; font-size: $euiFontSizeS; font-family: $euiFontFamily; - line-height: normal; padding: $euiSizeM; color: $euiTextColor; background: $euiFormBackgroundColor;