Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

Commit 6633f11

Browse files
committed
made text color override other props that change color
1 parent d254ddb commit 6633f11

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/themes/teams/colors.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ export const naturalColors: NaturalColors = {
8888
800: '#F9D844',
8989
900: '#F8D22A',
9090
},
91-
9291
darkOrange: {
9392
50: '#F9ECEA',
9493
100: '#ECBCB3',

src/themes/teams/components/Text/textStyles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export default {
2424
}: ComponentStyleFunctionParam<TextProps, TextVariables>): ICSSInJSStyle => {
2525
return {
2626
display: 'inline-block',
27-
color: _.get(v.colors, color),
2827
...(truncated && truncateStyle),
2928
...(atMention === true && {
3029
color: v.atMentionOtherColor,
@@ -47,6 +46,7 @@ export default {
4746
fontWeight: v.importantWeight,
4847
color: v.importantColor,
4948
}),
49+
...(color && { color: _.get(v.colors, color) }),
5050

5151
...(weight === 'light' && {
5252
fontWeight: v.fontWeightLight,

0 commit comments

Comments
 (0)