From 665df8b6cfea4d3fb600009cf71ab6f5736a90d4 Mon Sep 17 00:00:00 2001 From: Jill Guyonnet Date: Wed, 18 Dec 2024 09:07:46 +0100 Subject: [PATCH] [Fleet][Eui Visual Refresh] Update text color tokens (#204537) ## Summary Closes https://github.com/elastic/kibana/issues/201989 This PR updates color variables to the up-to-date naming per https://github.com/elastic/kibana/issues/199715#renamed. Impacted elements: 1. Read-only icon buttons in Fleet and Integrations top bar. 2. Danger-styled context menu item for deleting package policy from agent policy. I have also reviews [all occurrences](https://github.com/search?q=repo%3Aelastic%2Fkibana+path%3Ax-pack%2Fplugins%2Ffleet%2Fpublic+color%3D%22text&type=code) of `color="text` throughout fleet and found these to be part of the following components: - `EuiButton` - `EuiButtonEmpty` - `EuiButtonIcon` - `EuiIcon` The use of `color="text"` seems to be valid for these cases. ## Screenshots ### Amsterdam Read-only Fleet top bar: fleet-readonly-amsterdam Read-only Integrations top bar: integrations-readonly-amsterdam Delete integration context menu item: delete-integration-amsterdam ### Borealis Read-only Fleet top bar: fleet-readonly-borealis Read-only Integrations top bar: integrations-readonly-borealis Delete integration context menu item: delete-integration-borealis --- .../fleet/public/applications/fleet/app.tsx | 2 +- .../integrations/components/header/header.tsx | 2 +- .../danger_eui_context_menu_item.tsx | 20 ++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx index 8a4edef8dc87c..0041ffa091051 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx @@ -247,7 +247,7 @@ const FleetTopNav = memo( const readOnlyBtnClass = React.useMemo(() => { return css` - color: ${euiTheme.colors.text}; + color: ${euiTheme.colors.textParagraph}; `; }, [euiTheme]); diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx index 30fc0f0d4965f..f9a8ad22cddc5 100644 --- a/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx +++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/header.tsx @@ -34,7 +34,7 @@ export const IntegrationsHeader = ({ const { euiTheme } = useEuiTheme(); const readOnlyBtnClass = React.useMemo(() => { return css` - color: ${euiTheme.colors.text}; + color: ${euiTheme.colors.textParagraph}; `; }, [euiTheme]); const isReadOnly = useIsReadOnly(); diff --git a/x-pack/plugins/fleet/public/components/danger_eui_context_menu_item.tsx b/x-pack/plugins/fleet/public/components/danger_eui_context_menu_item.tsx index 87fb523121cfe..b7983ac255fb6 100644 --- a/x-pack/plugins/fleet/public/components/danger_eui_context_menu_item.tsx +++ b/x-pack/plugins/fleet/public/components/danger_eui_context_menu_item.tsx @@ -5,9 +5,19 @@ * 2.0. */ -import styled from 'styled-components'; -import { EuiContextMenuItem } from '@elastic/eui'; +import React from 'react'; +import { css } from '@emotion/react'; +import type { EuiContextMenuItemProps } from '@elastic/eui'; +import { EuiContextMenuItem, useEuiTheme } from '@elastic/eui'; -export const DangerEuiContextMenuItem = styled(EuiContextMenuItem)` - color: ${(props) => props.theme.eui.euiColorDangerText}; -`; +export const DangerEuiContextMenuItem = (props: EuiContextMenuItemProps) => { + const theme = useEuiTheme(); + return ( + + ); +};