fix/the_UI_of_recent_assets, use icon button

Signed-off-by: Qxisylolo <[email protected]>
opensearch-project · Dec 23, 2024 · 92a4a25 · 92a4a25
1 parent ee70b09
commit 92a4a25
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/core/public/chrome/ui/header/recent_items.tsx b/src/core/public/chrome/ui/header/recent_items.tsx
@@ -136,6 +136,7 @@ export const RecentItems = ({
       ownFocus={false}
       panelPaddingSize="s"
       button={
+<<<<<<< HEAD
 <<<<<<< HEAD
         <EuiButtonIcon
 =======
@@ -144,16 +145,22 @@ export const RecentItems = ({
           flush="left"
           size="xs"
 >>>>>>> 30e0396b3d (resolve conflicts)
+=======
+        <EuiButtonIcon
+>>>>>>> c3bc8423c9 (fix/the_UI_of_recent_assets, use icon button)
           color="primary"
           size="xs"
           onClick={() => {
             setIsPreferencesPopoverOpen((IsPreferencesPopoverOpe) => !IsPreferencesPopoverOpe);
           }}
+<<<<<<< HEAD
 <<<<<<< HEAD
           iconType="managementApp"
           data-test-subj="preferencesSettingButton"
         />
 =======
+=======
+>>>>>>> c3bc8423c9 (fix/the_UI_of_recent_assets, use icon button)
         >
 <<<<<<< HEAD
           {i18n.translate('core.header.recent.preferences', {
@@ -163,7 +170,15 @@ export const RecentItems = ({
           <EuiIcon type="managementApp" />
 >>>>>>> 4da93130e3 (resolve conflicts)
         </EuiButtonEmpty>
+<<<<<<< HEAD
 >>>>>>> c24d5bc842 ([Workspace] feat: optimize recent items and filter out items whose workspace is deleted (#8900))
+=======
+=======
+          iconType="managementApp"
+          data-test-subj="preferencesSettingButton"
+        />
+>>>>>>> 37971c9b49 (fix/the_UI_of_recent_assets, use icon button)
+>>>>>>> c3bc8423c9 (fix/the_UI_of_recent_assets, use icon button)
       }
       isOpen={isPreferencesPopoverOpen}
       anchorPosition="downLeft"