Skip to content

Commit 92a7445

Browse files
authored
Fix button bg (#581)
* Fix button hover accent color * v5.0.67
1 parent 842ff87 commit 92a7445

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netdata/netdata-ui",
3-
"version": "5.0.66",
3+
"version": "5.0.67",
44
"description": "netdata UI kit",
55
"main": "dist/index.js",
66
"module": "dist/es6/index.js",

src/components/button/styled.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,21 @@ const getTextColor = props =>
5050
: getColor(props.flavour === HOLLOW ? "secondaryColor" : "mainBackground")(props)
5151
const getHoverColor = props =>
5252
props.neutral ? getColor("generic")(props) : getColor("accent")(props)
53-
const getAccentColor = props =>
54-
props.neutral
55-
? getColor(props.flavour === BORDER_LESS ? "textFocus" : "neutralHighlight")(props)
56-
: getColor(props.flavour === HOLLOW ? "secondaryHighlight" : "primaryHighlight")(props)
53+
54+
const getAccentColor = props => {
55+
if (props.neutral)
56+
return getColor(props.flavour === BORDER_LESS ? "textFocus" : "neutralHighlight")(props)
57+
58+
const errorColor = props.danger ? "error" : undefined
59+
const errorBgColor = props.danger ? "errorSemi" : undefined
60+
const warningColor = props.warning ? "warning" : undefined
61+
const warningBgColor = props.warning ? "warningSemi" : undefined
62+
const primaryColor = errorColor || warningColor || "primaryHighlight"
63+
const secondaryHollow = errorBgColor || warningBgColor || "secondaryHighlight"
64+
65+
return getColor(props.flavour === HOLLOW ? secondaryHollow : primaryColor)(props)
66+
}
67+
5768
const getTransparent = getColor(["transparent", "full"])
5869

5970
const colorsByFlavour = ({ flavour = DEFAULT, danger, warning, iconColor }) => {

0 commit comments

Comments
 (0)