From b2577174cbc389f5c81b6773241d0c9e941f40d2 Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Thu, 4 Jun 2020 16:11:25 -0400 Subject: [PATCH 1/8] round corners + bold titles --- src/themes/eui-amsterdam/overrides/_call_out.scss | 8 ++++++++ src/themes/eui-amsterdam/overrides/_index.scss | 1 + 2 files changed, 9 insertions(+) create mode 100644 src/themes/eui-amsterdam/overrides/_call_out.scss diff --git a/src/themes/eui-amsterdam/overrides/_call_out.scss b/src/themes/eui-amsterdam/overrides/_call_out.scss new file mode 100644 index 00000000000..b620af7134c --- /dev/null +++ b/src/themes/eui-amsterdam/overrides/_call_out.scss @@ -0,0 +1,8 @@ +.euiCallOut { + border-radius: $euiBorderRadius; + border-left: none; + + .euiCallOutHeader__title { + font-weight: $euiFontWeightBold; + } +} \ No newline at end of file diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss index 7e0fea7c17f..60780e633e5 100644 --- a/src/themes/eui-amsterdam/overrides/_index.scss +++ b/src/themes/eui-amsterdam/overrides/_index.scss @@ -1,4 +1,5 @@ @import 'button'; @import 'button_empty'; @import 'button_group'; +@import 'call_out'; @import 'text'; From 059963400dc733f54e7e9c09f4759d5bc8bfca89 Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Thu, 4 Jun 2020 16:39:14 -0400 Subject: [PATCH 2/8] no rounded corners on Flyout banner --- src/themes/eui-amsterdam/overrides/_flyout.scss | 5 +++++ src/themes/eui-amsterdam/overrides/_index.scss | 1 + 2 files changed, 6 insertions(+) create mode 100644 src/themes/eui-amsterdam/overrides/_flyout.scss diff --git a/src/themes/eui-amsterdam/overrides/_flyout.scss b/src/themes/eui-amsterdam/overrides/_flyout.scss new file mode 100644 index 00000000000..1c7a77b238f --- /dev/null +++ b/src/themes/eui-amsterdam/overrides/_flyout.scss @@ -0,0 +1,5 @@ +.euiFlyoutBody { + .euiFlyoutBody__banner .euiCallOut { + border-radius: 0; + } +} diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss index 60780e633e5..36f3540de6b 100644 --- a/src/themes/eui-amsterdam/overrides/_index.scss +++ b/src/themes/eui-amsterdam/overrides/_index.scss @@ -2,4 +2,5 @@ @import 'button_empty'; @import 'button_group'; @import 'call_out'; +@import 'flyout'; @import 'text'; From 100a6c89a75471143a92463f1dd33c6438091e9c Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Thu, 4 Jun 2020 17:09:01 -0400 Subject: [PATCH 3/8] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1295f044732..9f40511f04e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ - Improved `EuiPagination`, `EuiDataGrid`, `EuiBasicTable` and `EuiInMemoryTable` accessibility, causing `EuiPaginationButton` to require a new prop `pageIndex` ([#3294](https://github.com/elastic/eui/pull/3294)) - Replaced all usages of [`KeyboardEvent.keyCode`](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode) (deprecated) with [`KeyboardEvent.key`](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key). From `@elastic/eui/lib/services`, `keyCodes` has been replaced with `keys`, as has `cascadingMenuKeyCodes`->`cascadingMenuKeys`, and `comboBoxKeyCodes`->`comboBoxKeys`. The implementation of all of those exports (as well as `accessibleClickKeys`) all now use `KeyboardEvent.key` values. ([#3517](https://github.com/elastic/eui/pull/3517)) +**Theme: Amsterdam** + +- Removed left border from `EuiCallout` and added border radius and bold titles. ([#3557](https://github.com/elastic/eui/pull/3557/)) + ## [`24.1.0`](https://github.com/elastic/eui/tree/v24.1.0) From fcd410f01c259351685486af35872102d8a0f6ed Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Fri, 5 Jun 2020 14:49:30 -0400 Subject: [PATCH 4/8] semi bold titles --- src/components/flyout/_flyout_body.scss | 1 + src/themes/eui-amsterdam/overrides/_call_out.scss | 2 +- src/themes/eui-amsterdam/overrides/_flyout.scss | 10 +--------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/components/flyout/_flyout_body.scss b/src/components/flyout/_flyout_body.scss index c29f37a5af2..b81f57a537c 100644 --- a/src/components/flyout/_flyout_body.scss +++ b/src/components/flyout/_flyout_body.scss @@ -14,6 +14,7 @@ .euiFlyoutBody__banner .euiCallOut { border: none; // Remove border from callout when it is a flyout banner + border-radius: 0; padding-left: $euiSizeL; // Align callout's content with flyout's title padding-right: $euiSizeL; // Align callout's content with flyout's title } diff --git a/src/themes/eui-amsterdam/overrides/_call_out.scss b/src/themes/eui-amsterdam/overrides/_call_out.scss index b620af7134c..3b4715a5881 100644 --- a/src/themes/eui-amsterdam/overrides/_call_out.scss +++ b/src/themes/eui-amsterdam/overrides/_call_out.scss @@ -3,6 +3,6 @@ border-left: none; .euiCallOutHeader__title { - font-weight: $euiFontWeightBold; + font-weight: $euiFontWeightSemiBold; } } \ No newline at end of file diff --git a/src/themes/eui-amsterdam/overrides/_flyout.scss b/src/themes/eui-amsterdam/overrides/_flyout.scss index d9a58d853e1..007a46254e7 100644 --- a/src/themes/eui-amsterdam/overrides/_flyout.scss +++ b/src/themes/eui-amsterdam/overrides/_flyout.scss @@ -2,12 +2,4 @@ // The clip path ensures only the left side of the shadow is exposed. .euiFlyout { clip-path: polygon(-10% 0, 100% 0, 100% 100%, -10% 100%); -} - -.euiFlyoutBody { - // Amsterdam Callouts use rounded corners by default, but we don't want to use them here - .euiFlyoutBody__banner .euiCallOut { - border-radius: 0; - } -} - +} \ No newline at end of file From 93800bcb6fa39cb40e97a4cd71d59675359fdaf7 Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Fri, 5 Jun 2020 20:01:22 -0400 Subject: [PATCH 5/8] use medium font weight instead --- src/themes/eui-amsterdam/overrides/_call_out.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/eui-amsterdam/overrides/_call_out.scss b/src/themes/eui-amsterdam/overrides/_call_out.scss index 3b4715a5881..6b1597c1c8a 100644 --- a/src/themes/eui-amsterdam/overrides/_call_out.scss +++ b/src/themes/eui-amsterdam/overrides/_call_out.scss @@ -3,6 +3,6 @@ border-left: none; .euiCallOutHeader__title { - font-weight: $euiFontWeightSemiBold; + font-weight: $euiFontWeightMedium; } } \ No newline at end of file From ccc94917f5393d3fddb6727d80997f1079a867af Mon Sep 17 00:00:00 2001 From: Henry Harding Date: Fri, 5 Jun 2020 20:03:09 -0400 Subject: [PATCH 6/8] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f40511f04e..3b68357ae8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ **Theme: Amsterdam** -- Removed left border from `EuiCallout` and added border radius and bold titles. ([#3557](https://github.com/elastic/eui/pull/3557/)) +- Removed left border from `EuiCallout` and added border radius and increased font weight on titles. ([#3557](https://github.com/elastic/eui/pull/3557/)) ## [`24.1.0`](https://github.com/elastic/eui/tree/v24.1.0) From 29e56f715f7826ca14f2a3fa06aa160b73eec678 Mon Sep 17 00:00:00 2001 From: Caroline Horn <549577+cchaos@users.noreply.github.com> Date: Mon, 8 Jun 2020 11:15:28 -0400 Subject: [PATCH 7/8] Apply suggestions from code review --- CHANGELOG.md | 2 +- src/components/flyout/_flyout_body.scss | 2 +- src/themes/eui-amsterdam/overrides/_call_out.scss | 2 +- src/themes/eui-amsterdam/overrides/_flyout.scss | 2 +- src/themes/eui-amsterdam/overrides/_index.scss | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b68357ae8f..b8a918a6cea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ **Theme: Amsterdam** -- Removed left border from `EuiCallout` and added border radius and increased font weight on titles. ([#3557](https://github.com/elastic/eui/pull/3557/)) +- Updated`EuiCallout` by removing left border, adding border radius and increasing font weight on titles ([#3557](https://github.com/elastic/eui/pull/3557/)) ## [`24.1.0`](https://github.com/elastic/eui/tree/v24.1.0) diff --git a/src/components/flyout/_flyout_body.scss b/src/components/flyout/_flyout_body.scss index b81f57a537c..4dfe1d3bf62 100644 --- a/src/components/flyout/_flyout_body.scss +++ b/src/components/flyout/_flyout_body.scss @@ -14,7 +14,7 @@ .euiFlyoutBody__banner .euiCallOut { border: none; // Remove border from callout when it is a flyout banner - border-radius: 0; + border-radius: 0; // Ensures no border-radius in all themes padding-left: $euiSizeL; // Align callout's content with flyout's title padding-right: $euiSizeL; // Align callout's content with flyout's title } diff --git a/src/themes/eui-amsterdam/overrides/_call_out.scss b/src/themes/eui-amsterdam/overrides/_call_out.scss index 6b1597c1c8a..c13e2c1e396 100644 --- a/src/themes/eui-amsterdam/overrides/_call_out.scss +++ b/src/themes/eui-amsterdam/overrides/_call_out.scss @@ -5,4 +5,4 @@ .euiCallOutHeader__title { font-weight: $euiFontWeightMedium; } -} \ No newline at end of file +} diff --git a/src/themes/eui-amsterdam/overrides/_flyout.scss b/src/themes/eui-amsterdam/overrides/_flyout.scss index 007a46254e7..6e78d2fe0ce 100644 --- a/src/themes/eui-amsterdam/overrides/_flyout.scss +++ b/src/themes/eui-amsterdam/overrides/_flyout.scss @@ -2,4 +2,4 @@ // The clip path ensures only the left side of the shadow is exposed. .euiFlyout { clip-path: polygon(-10% 0, 100% 0, 100% 100%, -10% 100%); -} \ No newline at end of file +} diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss index 56585668e3a..5ec10c7518c 100644 --- a/src/themes/eui-amsterdam/overrides/_index.scss +++ b/src/themes/eui-amsterdam/overrides/_index.scss @@ -8,4 +8,4 @@ @import 'modal'; @import 'overlay_mask'; @import 'popover'; -@import 'text'; \ No newline at end of file +@import 'text'; From 496c068c896aa0cdb172ea047a1a0c016becc069 Mon Sep 17 00:00:00 2001 From: Caroline Horn <549577+cchaos@users.noreply.github.com> Date: Mon, 8 Jun 2020 11:16:28 -0400 Subject: [PATCH 8/8] Fix my bad edit of CL --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a918a6cea..b3d3159c86f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ **Theme: Amsterdam** -- Updated`EuiCallout` by removing left border, adding border radius and increasing font weight on titles ([#3557](https://github.com/elastic/eui/pull/3557/)) +- Updated `EuiCallout` by removing left border, adding border radius and increasing font weight on titles ([#3557](https://github.com/elastic/eui/pull/3557/)) ## [`24.1.0`](https://github.com/elastic/eui/tree/v24.1.0)