Skip to content

Commit

Permalink
Merge 3c28358 into 9371f6f
Browse files Browse the repository at this point in the history
  • Loading branch information
gilluminate authored Dec 11, 2024
2 parents 9371f6f + 3c28358 commit e2f4f4e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ The types of changes are:
### Fixed
- Fixing quickstart.py script [#5585](https://github.com/ethyca/fides/pull/5585)

### Changed
- Adjusted Ant's Select component colors and icon [#5594](https://github.com/ethyca/fides/pull/5594)

## [2.51.1](https://github.com/ethyca/fides/compare/2.51.0...2.51.1)

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/src/theme/ant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const antTheme: AntThemeConfig = {
bodyBg: palette.FIDESUI_NEUTRAL_50,
},
Select: {
optionActiveBg: palette.FIDESUI_SANDSTONE,
optionActiveBg: palette.FIDESUI_NEUTRAL_50,
},
Tooltip: {
colorBgSpotlight: palette.FIDESUI_MINOS,
Expand Down
4 changes: 3 additions & 1 deletion clients/fidesui/src/hoc/CustomSelect.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChevronDown } from "@carbon/icons-react";
import { Checkmark, ChevronDown } from "@carbon/icons-react";
import { Flex, Select, SelectProps, Typography } from "antd/lib";
import { BaseOptionType, DefaultOptionType } from "antd/lib/select";
import React from "react";
Expand Down Expand Up @@ -37,13 +37,15 @@ const withCustomProps = (WrappedComponent: typeof Select) => {
optionRender = optionDescriptionRender,
className = "w-full",
suffixIcon = <ChevronDown />,
menuItemSelectedIcon = <Checkmark />,
...props
}: SelectProps<ValueType, OptionType>) => {
const customProps = {
placeholder,
optionRender,
className,
suffixIcon,
menuItemSelectedIcon,
"data-testid": `select${props.id ? `-${props.id}` : ""}`,
...props,
};
Expand Down

0 comments on commit e2f4f4e

Please sign in to comment.