From ea6619f452c26eb1c0bad419e47b81ac51357608 Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Tue, 11 Apr 2023 18:35:54 -0700
Subject: [PATCH] [EuiSuperDatePicker] Fix border-radius & remove unnecessary
 CSS/overrides

---
 .../super_date_picker/_super_date_picker.scss      | 13 +------------
 .../date_popover/_date_popover_button.scss         |  4 ++--
 src/themes/amsterdam/overrides/_date_picker.scss   | 10 ----------
 .../amsterdam/overrides/_date_popover_button.scss  | 14 --------------
 src/themes/amsterdam/overrides/_index.scss         |  1 -
 5 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 src/themes/amsterdam/overrides/_date_popover_button.scss

diff --git a/src/components/date_picker/super_date_picker/_super_date_picker.scss b/src/components/date_picker/super_date_picker/_super_date_picker.scss
index 3d809ca25f2..66c53d8764a 100644
--- a/src/components/date_picker/super_date_picker/_super_date_picker.scss
+++ b/src/components/date_picker/super_date_picker/_super_date_picker.scss
@@ -43,21 +43,10 @@
     overflow: hidden;
     background-color: $euiFormBackgroundColor;
 
-    > .euiDatePickerRange {
-      max-width: none;
-      width: auto;
+    &:last-child {
       border-radius: 0 $euiFormControlBorderRadius $euiFormControlBorderRadius 0;
     }
 
-    &:not(:last-child) > .euiDatePickerRange {
-      &,
-      .euiDatePopoverButton--end,
-      .euiSuperDatePicker__prettyFormat {
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-      }
-    }
-
     & > .euiFormControlLayoutDelimited__input {
       flex-grow: 1;
     }
diff --git a/src/components/date_picker/super_date_picker/date_popover/_date_popover_button.scss b/src/components/date_picker/super_date_picker/date_popover/_date_popover_button.scss
index 5042743941c..96f20dde83b 100644
--- a/src/components/date_picker/super_date_picker/date_popover/_date_popover_button.scss
+++ b/src/components/date_picker/super_date_picker/date_popover/_date_popover_button.scss
@@ -44,9 +44,9 @@
 }
 
 .euiDatePopoverButton--start {
-  text-align: right;
+  text-align: center;
 }
 
 .euiDatePopoverButton--end {
-  text-align: left;
+  text-align: center;
 }
diff --git a/src/themes/amsterdam/overrides/_date_picker.scss b/src/themes/amsterdam/overrides/_date_picker.scss
index a2bc8ea1b50..aebe13a68d4 100644
--- a/src/themes/amsterdam/overrides/_date_picker.scss
+++ b/src/themes/amsterdam/overrides/_date_picker.scss
@@ -11,13 +11,3 @@
 .euiDatePicker.euiDatePicker--shadow.euiDatePicker--inline .react-datepicker {
   border: none;
 }
-
-.euiSuperDatePicker__prettyFormat {
-  border-top-right-radius: $euiFormControlBorderRadius;
-  border-bottom-right-radius: $euiFormControlBorderRadius;
-}
-
-.euiFormControlLayout--compressed.euiSuperDatePicker .euiSuperDatePicker__prettyFormat {
-  border-top-right-radius: $euiFormControlCompressedBorderRadius;
-  border-bottom-right-radius: $euiFormControlCompressedBorderRadius;
-}
diff --git a/src/themes/amsterdam/overrides/_date_popover_button.scss b/src/themes/amsterdam/overrides/_date_popover_button.scss
deleted file mode 100644
index 6b5d91cd27f..00000000000
--- a/src/themes/amsterdam/overrides/_date_popover_button.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-.euiDatePopoverButton--start {
-  text-align: center;
-}
-
-.euiDatePopoverButton--end {
-  text-align: center;
-  border-top-right-radius: $euiFormControlBorderRadius;
-  border-bottom-right-radius: $euiFormControlBorderRadius;
-
-  &.euiDatePopoverButton--compressed {
-    border-top-right-radius: $euiFormControlCompressedBorderRadius;
-    border-bottom-right-radius: $euiFormControlCompressedBorderRadius;
-  }
-}
diff --git a/src/themes/amsterdam/overrides/_index.scss b/src/themes/amsterdam/overrides/_index.scss
index f3c16fa9c2f..7fb853f7628 100644
--- a/src/themes/amsterdam/overrides/_index.scss
+++ b/src/themes/amsterdam/overrides/_index.scss
@@ -1,7 +1,6 @@
 @import 'combo_box';
 @import 'data_grid';
 @import 'date_picker';
-@import 'date_popover_button';
 @import 'description_list';
 @import 'filter_group';
 @import 'form_control_layout';