From d51c6ae058a03651a606d281249880877e2670b5 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 13 Aug 2024 10:56:39 -0700 Subject: [PATCH 1/5] update styling for empty button and date picker icon Signed-off-by: Shenoy Pratik --- src/components/button/button_empty/_button_empty.scss | 1 + .../quick_select_popover/_quick_select_popover.scss | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/button/button_empty/_button_empty.scss b/src/components/button/button_empty/_button_empty.scss index d18a7bb3d1..bc17414f68 100644 --- a/src/components/button/button_empty/_button_empty.scss +++ b/src/components/button/button_empty/_button_empty.scss @@ -96,6 +96,7 @@ $ouiButtonEmptyTypes: ( // Ghost is unique and ALWAYS sits against a dark background. color: $color; } @else if ($name == 'text') { + line-height: inherit; // The default color is lighter than the normal text color, make the it the text color color: $ouiTextColor; } @else { diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss b/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss index c9e53c67c1..9f0c629641 100644 --- a/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss +++ b/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss @@ -23,9 +23,11 @@ } // sass-lint:disable no-important -.ouiQuickSelectPopover__buttonText { - // Override specificity from universal and sibling selectors - margin-right: $ouiSizeXS !important; +.ouiFormControlLayout__prepend{ + .ouiQuickSelectPopover__buttonText { + // Override specificity from universal and sibling selectors + margin-right: calc($ouiSizeXS/2) !important; + } } .ouiQuickSelectPopover__anchor { From a95e4d2490de06a156d8d982cd3cd6b2d8da0e31 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Wed, 14 Aug 2024 10:18:19 -0700 Subject: [PATCH 2/5] move line-height to empty button class Signed-off-by: Shenoy Pratik --- src/components/button/button_empty/_button_empty.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/button/button_empty/_button_empty.scss b/src/components/button/button_empty/_button_empty.scss index bc17414f68..a09c4566ce 100644 --- a/src/components/button/button_empty/_button_empty.scss +++ b/src/components/button/button_empty/_button_empty.scss @@ -25,6 +25,7 @@ animation: none !important; /* 1 */ transition-timing-function: ease-in; /* 2 */ transition-duration: $ouiAnimSpeedFast; /* 2 */ + line-height: inherit; .ouiButtonEmpty__content { padding: 0 $ouiSizeS; @@ -96,7 +97,6 @@ $ouiButtonEmptyTypes: ( // Ghost is unique and ALWAYS sits against a dark background. color: $color; } @else if ($name == 'text') { - line-height: inherit; // The default color is lighter than the normal text color, make the it the text color color: $ouiTextColor; } @else { From 331261ca12d666c44b932cdbe59fa86aad633ca5 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Wed, 14 Aug 2024 11:31:05 -0700 Subject: [PATCH 3/5] update changelog Signed-off-by: Shenoy Pratik --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6a846d8f6..956ab353e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### 🐛 Bug Fixes - Fixes combobox height with appendees ([#1338](https://github.com/opensearch-project/oui/pull/1338)) +- Update styling for empty button and date picker icon ([#1342](https://github.com/opensearch-project/oui/pull/1342)) ### 🚞 Infrastructure From 555b6238ba6cab6c8d3258c75b1e4a89c7142677 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Wed, 14 Aug 2024 16:23:34 -0700 Subject: [PATCH 4/5] remove specificity for QuickSelectPopover Signed-off-by: Shenoy Pratik --- .../quick_select_popover/_quick_select_popover.scss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss b/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss index 9f0c629641..4782abb624 100644 --- a/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss +++ b/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss @@ -23,11 +23,9 @@ } // sass-lint:disable no-important -.ouiFormControlLayout__prepend{ - .ouiQuickSelectPopover__buttonText { - // Override specificity from universal and sibling selectors - margin-right: calc($ouiSizeXS/2) !important; - } +.ouiQuickSelectPopover__buttonText { + // Override specificity from universal and sibling selectors + margin-right: calc($ouiSizeXS/2) !important; } .ouiQuickSelectPopover__anchor { From 59cc7270c8143184ce1956da666e9a30bb7637ff Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Thu, 15 Aug 2024 09:17:34 -0700 Subject: [PATCH 5/5] fix formatting in for calc Signed-off-by: Shenoy Pratik --- .../quick_select_popover/_quick_select_popover.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss b/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss index 4782abb624..3a368bae3f 100644 --- a/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss +++ b/src/components/date_picker/super_date_picker/quick_select_popover/_quick_select_popover.scss @@ -25,7 +25,7 @@ // sass-lint:disable no-important .ouiQuickSelectPopover__buttonText { // Override specificity from universal and sibling selectors - margin-right: calc($ouiSizeXS/2) !important; + margin-right: calc($ouiSizeXS / 2) !important; } .ouiQuickSelectPopover__anchor {