diff --git a/frontend/components/icons/Chevron.tsx b/frontend/components/icons/Chevron.tsx index 4602eb5e2a..4002989e2e 100644 --- a/frontend/components/icons/Chevron.tsx +++ b/frontend/components/icons/Chevron.tsx @@ -17,7 +17,7 @@ const SVG_PATH = { }; const FLEET_COLORS = { - coreFleetBlack: "#6a67fe", + coreFleetBlack: "#192147", coreVibrantBlue: "#6a67fe", }; diff --git a/frontend/pages/hosts/ManageHostsPage/components/CustomDropdownIndicator/CustomDropdownIndicator.tsx b/frontend/pages/hosts/ManageHostsPage/components/CustomDropdownIndicator/CustomDropdownIndicator.tsx index fae354a34c..796b45a686 100644 --- a/frontend/pages/hosts/ManageHostsPage/components/CustomDropdownIndicator/CustomDropdownIndicator.tsx +++ b/frontend/pages/hosts/ManageHostsPage/components/CustomDropdownIndicator/CustomDropdownIndicator.tsx @@ -15,7 +15,8 @@ const CustomDropdownIndicator = ( // no access to hover state here from react-select so that is done in the scss // file of LabelFilterSelect. const color = - isFocused || selectProps.menuIsOpen ? "coreVibrantBlue" : undefined; + isFocused || selectProps.menuIsOpen ? "coreVibrantBlue" : "coreFleetBlack"; + return ( diff --git a/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/LabelFilterSelect.tsx b/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/LabelFilterSelect.tsx index d56444fee1..507bfae91b 100644 --- a/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/LabelFilterSelect.tsx +++ b/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/LabelFilterSelect.tsx @@ -4,6 +4,7 @@ import classnames from "classnames"; import { ILabel } from "interfaces/label"; import { PLATFORM_LABEL_DISPLAY_NAMES } from "utilities/constants"; +import Icon from "components/Icon"; import CustomLabelGroupHeading from "../CustomLabelGroupHeading"; import { PLATFORM_TYPE_ICONS } from "./constants"; @@ -49,7 +50,10 @@ const OptionLabel = (data: ILabel | IEmptyOption) => { return (
{isPlatform && ( - + )} {labelText}
diff --git a/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/_styles.scss b/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/_styles.scss index 6891b4073a..f29ade642a 100644 --- a/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/_styles.scss +++ b/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/_styles.scss @@ -2,11 +2,10 @@ width: 175px; &:hover { - // no access to hover state from react-select in JS so this is done here. .custom-dropdown-indicator { & path { - fill: $core-vibrant-blue + fill: $core-vibrant-blue; } } } @@ -34,12 +33,10 @@ position: absolute; content: url(../assets/images/icon-filter-v2-black-16x16@2x.png); transform: scale(0.5); - top: -2px; left: -6px; } } - .label-filter-select__single-value, .label-filter-select__placeholder { color: $core-fleet-black; @@ -112,9 +109,7 @@ white-space: nowrap; } - img { - width: 16px; - height: 16px; + .option-icon { margin-right: $pad-small; } } diff --git a/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/constants.ts b/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/constants.ts index 904996a55a..20da8ac009 100644 --- a/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/constants.ts +++ b/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/constants.ts @@ -1,7 +1,3 @@ -import linuxIcon from "../../../../../../assets/images/icon-linux-fleet-black-16x16@2x.png"; -import darwinIcon from "../../../../../../assets/images/icon-darwin-fleet-black-16x16@2x.png"; -import windowsIcon from "../../../../../../assets/images/icon-windows-fleet-black-16x16@2x.png"; - export const NO_LABELS_OPTION = { label: "No custom labels", isDisabled: true, @@ -13,9 +9,9 @@ export const EMPTY_OPTION = { }; export const PLATFORM_TYPE_ICONS: Record = { - "All Linux": linuxIcon, - macOS: darwinIcon, - "MS Windows": windowsIcon, + "All Linux": "linux", + macOS: "darwin", + "MS Windows": "windows", }; export const FILTERED_LINUX = ["Red Hat Linux", "CentOS Linux", "Ubuntu Linux"];