From 39d04466e25e7c6989afb638c97d2c4bd8c4b2a0 Mon Sep 17 00:00:00 2001 From: Anurag Gupta Date: Mon, 15 Feb 2021 21:26:43 +0530 Subject: [PATCH 1/6] Removed Bug --- src/components/date_picker/_date_picker.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/date_picker/_date_picker.scss b/src/components/date_picker/_date_picker.scss index 2d97730d5e1..03abd8b9f47 100644 --- a/src/components/date_picker/_date_picker.scss +++ b/src/components/date_picker/_date_picker.scss @@ -82,7 +82,7 @@ text-align: left; padding-left: $euiSizeXL + $euiSizeXS; padding-right: $euiSizeXL + $euiSizeXS; - color: $euiTextColor; + // color: $euiTextColor; &.react-datepicker__time-list-item--selected { color: $euiColorGhost; From 5918759eded992fc01a2e109f5ffb2052a984b5c Mon Sep 17 00:00:00 2001 From: Anurag Gupta Date: Wed, 17 Feb 2021 16:55:40 +0530 Subject: [PATCH 2/6] Made changes --- src/components/date_picker/_date_picker.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/date_picker/_date_picker.scss b/src/components/date_picker/_date_picker.scss index 03abd8b9f47..a411976a570 100644 --- a/src/components/date_picker/_date_picker.scss +++ b/src/components/date_picker/_date_picker.scss @@ -82,11 +82,16 @@ text-align: left; padding-left: $euiSizeXL + $euiSizeXS; padding-right: $euiSizeXL + $euiSizeXS; - // color: $euiTextColor; &.react-datepicker__time-list-item--selected { color: $euiColorGhost; } + &.react-datepicker__time-list-item--disabled{ + color: $euiColorDisabledText + } + &.react-datepicker__time-list-item--injected{ + color: $euiColorDisabledText + } } } } From d43ce69deedb072a34a5f55e4dc6a1464a5f6fed Mon Sep 17 00:00:00 2001 From: Anurag Gupta Date: Wed, 17 Feb 2021 22:25:32 +0530 Subject: [PATCH 3/6] Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b34b3d72cc..eb995ef0335 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fixed nested indicator of last `EuiSideNav` item ([#4488](https://github.com/elastic/eui/pull/4488)) - Fixed override possibility of text `color` in `EuiSideNavItem` ([#4488](https://github.com/elastic/eui/pull/4488)) +- Fixed the bug of not seeing difference between the disabled/non-disabled times in `EuiDatePicker` ([#4524](https://github.com/elastic/eui/pull/4524)) **Theme: Amsterdam** From 442b7b43f55a5a9b075fe8657ae1d0ef84d04164 Mon Sep 17 00:00:00 2001 From: Anurag Gupta <58766532+git-anurag-hub@users.noreply.github.com> Date: Wed, 17 Feb 2021 23:51:37 +0530 Subject: [PATCH 4/6] Update src/components/date_picker/_date_picker.scss Co-authored-by: Caroline Horn <549577+cchaos@users.noreply.github.com> --- src/components/date_picker/_date_picker.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/date_picker/_date_picker.scss b/src/components/date_picker/_date_picker.scss index a411976a570..7f8178a1f15 100644 --- a/src/components/date_picker/_date_picker.scss +++ b/src/components/date_picker/_date_picker.scss @@ -89,9 +89,6 @@ &.react-datepicker__time-list-item--disabled{ color: $euiColorDisabledText } - &.react-datepicker__time-list-item--injected{ - color: $euiColorDisabledText - } } } } From dded5dad61aca7dfbc5a6f82bc56f82db196a029 Mon Sep 17 00:00:00 2001 From: Anurag Gupta <58766532+git-anurag-hub@users.noreply.github.com> Date: Wed, 17 Feb 2021 23:51:53 +0530 Subject: [PATCH 5/6] Update CHANGELOG.md Co-authored-by: Caroline Horn <549577+cchaos@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb995ef0335..36701734665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Fixed nested indicator of last `EuiSideNav` item ([#4488](https://github.com/elastic/eui/pull/4488)) - Fixed override possibility of text `color` in `EuiSideNavItem` ([#4488](https://github.com/elastic/eui/pull/4488)) -- Fixed the bug of not seeing difference between the disabled/non-disabled times in `EuiDatePicker` ([#4524](https://github.com/elastic/eui/pull/4524)) +- Fixed styles of `disabled` times in `EuiDatePicker` ([#4524](https://github.com/elastic/eui/pull/4524)) **Theme: Amsterdam** From 8d5f56a2427d64de6bcdd2991ff5080da0526ef0 Mon Sep 17 00:00:00 2001 From: Caroline Horn <549577+cchaos@users.noreply.github.com> Date: Wed, 17 Feb 2021 14:05:27 -0500 Subject: [PATCH 6/6] Putting text color back --- src/components/date_picker/_date_picker.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/date_picker/_date_picker.scss b/src/components/date_picker/_date_picker.scss index 7f8178a1f15..82451674144 100644 --- a/src/components/date_picker/_date_picker.scss +++ b/src/components/date_picker/_date_picker.scss @@ -82,10 +82,12 @@ text-align: left; padding-left: $euiSizeXL + $euiSizeXS; padding-right: $euiSizeXL + $euiSizeXS; + color: $euiTextColor; &.react-datepicker__time-list-item--selected { color: $euiColorGhost; } + &.react-datepicker__time-list-item--disabled{ color: $euiColorDisabledText }