@@ -50,10 +50,21 @@ const getTextColor = props =>
5050 :getColor ( props . flavour === HOLLOW ?"secondaryColor" :"mainBackground" ) ( props )
5151const getHoverColor = props =>
5252props . 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+
5768const getTransparent = getColor ( [ "transparent" , "full" ] )
5869
5970const colorsByFlavour = ( { flavour= DEFAULT , danger, warning, iconColor} ) => {