From 7a1ea779fe8dd6815495eaf83ef172fb2d5e4840 Mon Sep 17 00:00:00 2001 From: John Barrier Wilson Date: Tue, 26 May 2020 10:10:22 -0500 Subject: [PATCH 1/5] Remove modal border & improve overlay color --- src/themes/eui-amsterdam/overrides/_index.scss | 2 ++ src/themes/eui-amsterdam/overrides/_modal.scss | 4 ++++ src/themes/eui-amsterdam/overrides/_overlay_mask.scss | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 src/themes/eui-amsterdam/overrides/_modal.scss create mode 100644 src/themes/eui-amsterdam/overrides/_overlay_mask.scss diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss index 7e0fea7c17f..77c9445bc1f 100644 --- a/src/themes/eui-amsterdam/overrides/_index.scss +++ b/src/themes/eui-amsterdam/overrides/_index.scss @@ -1,4 +1,6 @@ @import 'button'; @import 'button_empty'; @import 'button_group'; +@import 'modal'; +@import 'overlay_mask'; @import 'text'; diff --git a/src/themes/eui-amsterdam/overrides/_modal.scss b/src/themes/eui-amsterdam/overrides/_modal.scss new file mode 100644 index 00000000000..05bf5ccfcd2 --- /dev/null +++ b/src/themes/eui-amsterdam/overrides/_modal.scss @@ -0,0 +1,4 @@ +.euiModal { + border: none; + border-radius: $euiSizeS; +} \ No newline at end of file diff --git a/src/themes/eui-amsterdam/overrides/_overlay_mask.scss b/src/themes/eui-amsterdam/overrides/_overlay_mask.scss new file mode 100644 index 00000000000..7f3b476a75b --- /dev/null +++ b/src/themes/eui-amsterdam/overrides/_overlay_mask.scss @@ -0,0 +1,3 @@ +.euiOverlayMask { + background: transparentize($euiColorInk, .4); +} \ No newline at end of file From b6f11fb8b3faafdb9f1a053441578400ced838bc Mon Sep 17 00:00:00 2001 From: John Barrier Wilson Date: Tue, 26 May 2020 10:19:45 -0500 Subject: [PATCH 2/5] Remove amsterdam modal border-radius --- src/themes/eui-amsterdam/overrides/_modal.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/themes/eui-amsterdam/overrides/_modal.scss b/src/themes/eui-amsterdam/overrides/_modal.scss index 05bf5ccfcd2..623c2bec624 100644 --- a/src/themes/eui-amsterdam/overrides/_modal.scss +++ b/src/themes/eui-amsterdam/overrides/_modal.scss @@ -1,4 +1,3 @@ .euiModal { border: none; - border-radius: $euiSizeS; } \ No newline at end of file From 061c980deb37fb36165ed45217bb9f3922f02a75 Mon Sep 17 00:00:00 2001 From: John Barrier Wilson Date: Tue, 26 May 2020 10:30:32 -0500 Subject: [PATCH 3/5] Adjust overlay mask transparency --- src/themes/eui-amsterdam/overrides/_overlay_mask.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/eui-amsterdam/overrides/_overlay_mask.scss b/src/themes/eui-amsterdam/overrides/_overlay_mask.scss index 7f3b476a75b..48e4cdcf9d7 100644 --- a/src/themes/eui-amsterdam/overrides/_overlay_mask.scss +++ b/src/themes/eui-amsterdam/overrides/_overlay_mask.scss @@ -1,3 +1,3 @@ .euiOverlayMask { - background: transparentize($euiColorInk, .4); + background: transparentize($euiColorInk, .6); } \ No newline at end of file From 1d0e0fa1a51ce250988e770b97789700ce3ddcdb Mon Sep 17 00:00:00 2001 From: John Barrier Wilson Date: Tue, 26 May 2020 10:33:53 -0500 Subject: [PATCH 4/5] Add changes to CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ee12037321..6a6f71ff7dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,11 @@ - Changed parameters for `euiPaletteColorBlind()` to an object ([#3387](https://github.com/elastic/eui/pull/3387)) - Changed the default palette of `EUI_CHARTS_THEME_LIGHT/DARK` themes to the naturally sorted `euiPaletteColorBlind()` ([#3387](https://github.com/elastic/eui/pull/3387)) +**Theme: Amsterdam** + +- Removed borders `EuiModal` ([#3515](https://github.com/elastic/eui/pull/3515)) +- Improve `EuiOverlayMask` colors ([#3515](https://github.com/elastic/eui/pull/3515)) + ## [`23.3.0`](https://github.com/elastic/eui/tree/v23.3.0) - Added `aria-hidden = true` to `EuiRangeSlider` and `EuiRangeTrack` if `showInput = true` ([#3423](https://github.com/elastic/eui/pull/3423)) From 22c287fda3b5cd1e2649d9f112a788d6029ceb31 Mon Sep 17 00:00:00 2001 From: John Barrier Wilson Date: Thu, 28 May 2020 10:20:27 -0500 Subject: [PATCH 5/5] Adjust EuiImage caption for darker overlay --- src/themes/eui-amsterdam/overrides/_image.scss | 6 ++++++ src/themes/eui-amsterdam/overrides/_index.scss | 1 + src/themes/eui-amsterdam/overrides/_overlay_mask.scss | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/themes/eui-amsterdam/overrides/_image.scss diff --git a/src/themes/eui-amsterdam/overrides/_image.scss b/src/themes/eui-amsterdam/overrides/_image.scss new file mode 100644 index 00000000000..34841c071cb --- /dev/null +++ b/src/themes/eui-amsterdam/overrides/_image.scss @@ -0,0 +1,6 @@ +.euiImage-isFullScreen { + .euiImage__caption { + color: $euiColorGhost; + text-shadow: 0 1px 2px transparentize($euiColorInk, .6); + } +} \ 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 77c9445bc1f..5e90889d844 100644 --- a/src/themes/eui-amsterdam/overrides/_index.scss +++ b/src/themes/eui-amsterdam/overrides/_index.scss @@ -1,6 +1,7 @@ @import 'button'; @import 'button_empty'; @import 'button_group'; +@import 'image'; @import 'modal'; @import 'overlay_mask'; @import 'text'; diff --git a/src/themes/eui-amsterdam/overrides/_overlay_mask.scss b/src/themes/eui-amsterdam/overrides/_overlay_mask.scss index 48e4cdcf9d7..022a18082f6 100644 --- a/src/themes/eui-amsterdam/overrides/_overlay_mask.scss +++ b/src/themes/eui-amsterdam/overrides/_overlay_mask.scss @@ -1,3 +1,3 @@ .euiOverlayMask { - background: transparentize($euiColorInk, .6); + background: transparentize($euiColorInk, .5); } \ No newline at end of file