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

feat(theme): updating color palette and scheme #1069

Merged
merged 132 commits into from
May 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
bd77115
wip
levithomason Mar 12, 2019
b4d5452
-fixed compiling issues
Mar 18, 2019
d3add7f
-fixed of the label components
Mar 18, 2019
697869d
-adding missing colors form the color scheme
Mar 18, 2019
bbf5b15
-updates on the text component
Mar 18, 2019
dd593b2
-added grey 900
Mar 18, 2019
1e934b7
-updated bodyBackground
Mar 18, 2019
01a90f0
Merge branch 'master' into feat/color-palette-update
Mar 18, 2019
9ece9dd
-updates on the color scheme grey color
Mar 18, 2019
330b8f4
-updated on the dark and high contrast themes
Mar 19, 2019
69c1ce6
-updated button variables in dark theme
Mar 19, 2019
7212f85
-improved typings
Mar 19, 2019
d180ff6
-updating primary menu styles (default, pointing)
Mar 20, 2019
e146c4f
-fixes of underlined menu
Mar 20, 2019
db569cc
-wip use border for components without background
Mar 20, 2019
718abe1
-wip fix
Mar 20, 2019
f4b8dca
-fixed vertical menu styles
Mar 20, 2019
043a667
-fixes for the border colors
Mar 20, 2019
8a1dd43
-fixed primary menu border color
Mar 20, 2019
8d59cf4
-fixes
Mar 20, 2019
f12c1ef
-fixed grey color
Mar 20, 2019
f0c2964
-fixed menu color example
Mar 20, 2019
72850da
-vertical pointing border color fix
Mar 21, 2019
4d53e35
-fixed icon only issues
Mar 21, 2019
66efad3
-fixed disabled color
Mar 21, 2019
f186a44
-updates on the color scheme
Mar 22, 2019
ce972b2
-removed unnecessary vertical color
Mar 22, 2019
b9f68ef
-fixed icons
Mar 22, 2019
4cc0c2f
Merge branch 'master' into feat/color-palette-update
Mar 22, 2019
09ff8c9
Merge branch 'master' into feat/color-palette-update
Mar 22, 2019
0de5235
-alert fixes
Mar 22, 2019
23d59fd
-update on the hover color
Mar 22, 2019
8a313fe
-updates of vertical focus styles
Mar 22, 2019
f4b9cec
-created functino for generating the colors scheme
Mar 25, 2019
0c67096
-updated color scheme for dark theme
Mar 25, 2019
703700b
-fixed vertical focus background
Mar 25, 2019
2c9b161
-fixed typings issues around color prop
Mar 25, 2019
64f0830
-fixed menu example color
Mar 25, 2019
6f36f3c
-extracted light colors overrides
Mar 25, 2019
05b5d49
-removed comments
Mar 25, 2019
785761b
-init hoc color scheme
Mar 25, 2019
1ff6062
-adjusments on the colors used in hoc
Mar 25, 2019
fc05434
Merge branch 'master' into feat/color-palette-update
Apr 5, 2019
89bb562
compiler issues
Apr 5, 2019
54fc16e
-updated colors
Apr 5, 2019
e6182cc
-updated list and radio group
Apr 5, 2019
a1a619d
-fix vertical focus background color in dark theme
Apr 5, 2019
ca87c86
-fixed disabled icon and menu item in dark theme
Apr 5, 2019
3165d4f
-fixing hover color on primary menu
Apr 5, 2019
2c43080
Merge branch 'master' into feat/color-palette-update
mnajdova Apr 5, 2019
b870aad
-replaced grey colors from color palette
Apr 8, 2019
6d27464
Merge remote-tracking branch 'origin/feat/color-palette-update' into …
Apr 8, 2019
0ae80d1
-replaced tinted background
Apr 8, 2019
baa2143
-replaced primary colors
Apr 8, 2019
7147cea
-fixes
Apr 8, 2019
140cdd7
-added orange colors
Apr 8, 2019
f91cc8a
-fixed errors
Apr 8, 2019
0fa9061
-converted red colors
Apr 8, 2019
bf47697
-updated some colors
Apr 9, 2019
b98eefc
-added green pink and orange colors
Apr 9, 2019
502a5bf
-removed unused imports
Apr 9, 2019
4c82a1c
-removed unused colors from dark theme color scheme
Apr 9, 2019
c23eb61
-removing more unused colors
Apr 9, 2019
5701c85
-removed unused imports
Apr 9, 2019
85d223c
-removed green04 from hoc site variables
Apr 10, 2019
1e4949b
-removed unused import
Apr 10, 2019
5318e64
-removed more colors from site variables
Apr 10, 2019
0cc3fdb
-move red color for hoc theme in colors.ts
Apr 10, 2019
5e85080
-changed black and white colors in variables in hoc theme
Apr 10, 2019
f3a8a4b
Merge branch 'master' into feat/color-palette-update
Apr 10, 2019
96f8574
-updates after merging master
Apr 10, 2019
add62e9
-improved typings
Apr 10, 2019
1fb0373
-updated more colors
Apr 10, 2019
0e0dd13
-replaced blue info color for the status with primary
Apr 10, 2019
c6a159c
-removed red color from dark theme
Apr 10, 2019
8f7854c
-improved typings of text variables in base team
Apr 11, 2019
5f97b4b
-fixed verticalBackgroundColor variables usage
Apr 11, 2019
009f1f7
-updated colors type in divider styles
Apr 11, 2019
83df6e8
-changed the way the ColorScheme is defined
Apr 11, 2019
10c7546
-fixed root/wrapper differences in picking the color
Apr 11, 2019
db04cf4
-changed chat message background color for mine messages
Apr 12, 2019
67d45e8
Merge branch 'master' into feat/color-palette-update
Apr 12, 2019
8b65931
-fixed for dark theme
Apr 12, 2019
b405b0e
-updated colors for list item and radio group in dark theme
Apr 12, 2019
74b29b0
-added function for extending the color palette
Apr 12, 2019
2b1adde
-fixed import in label variables
Apr 12, 2019
4fac4dc
-fixed colors in Chat perf examples to avoid screener regressions
Apr 12, 2019
e8e5313
-updated red[100] to match the correct color
Apr 12, 2019
1c2d77a
-fixed menuStyles
Apr 12, 2019
c74149e
-moved colorUtils to themes, and exported that as part of stardust
Apr 15, 2019
3cdac0b
-added colors guide
Apr 17, 2019
64db23b
Merge branch 'master' into feat/color-palette-update
Apr 17, 2019
0eaba88
-improved color picking in order to avoid null pointers
Apr 17, 2019
9109c48
-fixed typo
Apr 17, 2019
bd31400
-removed the added md file (will be added as a separate PR)
Apr 17, 2019
fa6ffea
-removed Text color from teams theme
Apr 18, 2019
bbd77b6
-addressing comments on the PR
Apr 18, 2019
ecc7e97
-addressing more comments on PR
Apr 18, 2019
1ccccc3
-addressing comments on the PR
Apr 18, 2019
4503e8e
-fixed some menu style sin hc theme
Apr 18, 2019
bdc4bce
-fixed text in color palette guide
Apr 18, 2019
2c1934b
-replaced getColorSchemeKey with getColorScheme
Apr 18, 2019
19e2abc
-fixed base theme Text's color scheme usage
Apr 18, 2019
fe46147
Merge branch 'master' into feat/color-palette-update
Apr 23, 2019
290971a
Merge branch 'master' into feat/color-palette-update
Apr 29, 2019
e433487
-merge conflicts
Apr 29, 2019
c37d609
-resolved eslint error
Apr 29, 2019
a506306
-updated color scheme
Apr 30, 2019
2cd0085
-fixed types
Apr 30, 2019
0a0e5d7
-fixed base theme colors
Apr 30, 2019
2f651a3
-added transparent colors to the color palette
Apr 30, 2019
83a379d
Merge branch 'master' into feat/color-palette-update
Apr 30, 2019
d42bce7
-fixed divider border color
Apr 30, 2019
e840df2
-improved disabled menu values
Apr 30, 2019
23d6037
-removed unnecessary comments
Apr 30, 2019
f4cc146
-removed unnecessary overrides
May 2, 2019
5a72de2
-fixed borderActive in primary's color schemes
May 2, 2019
7daccf2
-renamed primary to brand
May 6, 2019
a8311a5
-updated color schemes
May 7, 2019
9ddc71a
-added dark theme in the color scheme example
May 9, 2019
871b521
Merge branch 'master' into feat/color-palette-update
May 9, 2019
ec4e408
-updated changelog
May 9, 2019
b41c97a
-removed color prop from Menu
May 9, 2019
cf0c385
-added links for the color scheme and color palette on the colors guide
May 9, 2019
eb69a40
-fixed colors guide
May 9, 2019
0af64a4
Merge branch 'master' into feat/color-palette-update
May 9, 2019
cfd807b
-removed comments
May 9, 2019
eda0f3f
-fixed changelog
May 9, 2019
0464fee
-added unit tests for the colors utils
May 9, 2019
2ffd9a1
-replaced the order of the color schemes and color palette
May 9, 2019
e754a90
-addressed PR comments: colorScheme -> colors everywhere in the style…
May 9, 2019
4c6fbc5
-removed duplicate line in the typings
May 9, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### BREAKING CHANGES
- Rename `context` prop to `mountNode` in `PortalInner` @layershifter ([#1288](https://github.com/stardust-ui/react/pull/1288))
- Updated Teams' theme color palette values, removed color related site variables @mnajdova ([#1069](https://github.com/stardust-ui/react/pull/1069))

### Features

- Add default child a11y behavior to `Menu` related behaviors @silviuavram ([#1282](https://github.com/stardust-ui/react/pull/1282))
- `Ref` component extracted to a `@stardust-ui/react-component-ref` @layershifter ([#1281](https://github.com/stardust-ui/react/pull/1281))
- added `isRefObject()`, `toRefObject()` utils for React refs @layershifter ([#1281](https://github.com/stardust-ui/react/pull/1281))
- Add new callings icons in Teams theme @codepretty ([#1264](https://github.com/stardust-ui/react/pull/1264))
- Add `mountNode` and `mountDocument` props to allow proper multi-window rendering ([#1288](https://github.com/stardust-ui/react/pull/1288))
- Added default and brand color schemes in Teams' theme @mnajdova ([#1069](https://github.com/stardust-ui/react/pull/1069))

<!--------------------------------[ v0.29.1 ]------------------------------- -->
## [v0.29.1](https://github.com/stardust-ui/react/tree/v0.29.1) (2019-05-01)
Expand Down
13 changes: 10 additions & 3 deletions docs/src/components/ColorBox.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { ComponentSlotStylesInput, createComponent, Icon, ICSSInJSStyle } from '@stardust-ui/react'
import {
ComponentSlotStylesInput,
ComponentSlotStyle,
createComponent,
Icon,
ICSSInJSStyle,
} from '@stardust-ui/react'
import * as Color from 'color'
import * as _ from 'lodash'
import * as React from 'react'
Expand All @@ -11,6 +17,7 @@ type ColorBoxProps = {
rounded?: boolean
size?: 'small' | 'normal' | 'big'
value: string
styles?: ComponentSlotStyle
}

type ColorBoxVariables = {
Expand Down Expand Up @@ -48,7 +55,7 @@ export const colorBoxStyles: ComponentSlotStylesInput<ColorBoxProps, ColorBoxVar
backgroundColor: p.value,
border: '1px solid transparent',
borderRadius: p.rounded && '.25rem',
color: Color(p.value).isDark() ? v.colorWhite : v.colorBlack,
color: p.value !== undefined && Color(p.value).isDark() ? v.colorWhite : v.colorBlack,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

May it will be better just to skip undefined values?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this I wasn't sure myself. I wanted to emphasize that we are missing some of the colors, but I agree that it is confusing for the community to see these values empty values. @kuzhelov @layershifter what do you think?

display: 'grid',
gridTemplateColumns: 'repeat(2, 1fr)',
fontSize: v.padding[p.size],
Expand Down Expand Up @@ -78,7 +85,7 @@ const ColorBox = createComponent<ColorBoxProps>({
render={(active, onClick) => (
<div className={classes.value}>
<span onClick={onClick}>
<Icon name={active ? 'checkmark' : 'copy outline'} size="small" />
{value && <Icon name={active ? 'checkmark' : 'copy outline'} size="small" />}
{value}
</span>
</div>
Expand Down
60 changes: 60 additions & 0 deletions docs/src/components/ColorSchemes.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import * as React from 'react'
import * as _ from 'lodash'
import {
createComponent,
ComponentSlotStylesInput,
ThemePrepared,
Grid,
ShorthandValue,
Header,
} from '@stardust-ui/react'

import ColorBox from './ColorBox'

type ColorVariantsProps = {
name?: string
themes?: ThemePrepared[]
headers?: ShorthandValue[]
}

export const colorVariantsStyles: ComponentSlotStylesInput<ColorVariantsProps> = {
root: {
border: '1px solid transparent',
borderRadius: '.25rem',
overflow: 'hidden',
},
}

const ColorSchemes = createComponent<ColorVariantsProps>({
displayName: 'ColorVariants',
render: ({ name, themes, headers, stardust: { classes } }) => {
if (themes.length === 0) return <></>

const colorSchemes = _.map(themes, theme => theme.siteVariables.colorScheme[name])

const elements = _.flatMap(_.head(colorSchemes), (i, token) => [
<ColorBox
name={token}
key={`${token}schema`}
size="small"
value={undefined}
styles={{ backgroundColor: '#f2f2f2' }}
/>,
..._.map(colorSchemes, (colorScheme, i) => (
<ColorBox key={`${token}${i}`} size="small" value={colorScheme[token]} />
)),
])

const columns = `auto ${_.times(themes.length, () => '180px').join(' ')}`
return (
<div className={classes.root}>
<Grid columns={columns}>
{headers && headers.map(header => Header.create(header))}
{elements}
</Grid>
</div>
)
},
})

export default ColorSchemes
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ const ComponentControls: React.FC<ComponentControlsProps> = props => {
<Menu
{...rest}
fluid
color="green"
icon="labeled"
size="tiny"
pills
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/ComponentPlayground.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const ComponentPlayground: React.FunctionComponent<ComponentPlaygroundProps> = p
</Flex.Item>

<Flex.Item align="start" push>
<Segment color="primary">
<Segment color="brand">
<Header as="h4" className="no-anchor" styles={{ marginTop: 0 }}>
Props
</Header>
Expand Down
14 changes: 7 additions & 7 deletions docs/src/components/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,13 @@ class Sidebar extends React.Component<any, any> {
to: '/theming-examples',
styles: menuItemStyles,
},
{
key: 'colorpalette',
content: 'Colors',
as: NavLink,
to: '/color-palette',
styles: menuItemStyles,
},
{
key: 'layout',
content: 'Layout',
Expand Down Expand Up @@ -429,13 +436,6 @@ class Sidebar extends React.Component<any, any> {
to: '/menu-button',
styles: menuItemStyles,
},
{
key: 'colorpalette',
content: 'Color Palette',
as: NavLink,
to: '/color-palette',
styles: menuItemStyles,
},
{
key: 'divider4',
kind: 'divider',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ const ButtonUsageExampleShorthand = () => (
theme={{
componentVariables: {
Button: siteVariables => ({
color: siteVariables.colors.primary[500],
colorActive: siteVariables.brand04,
colorHover: siteVariables.brand04,
colorFocus: siteVariables.colors.primary[900],
backgroundColor: siteVariables.colors.grey[900],
backgroundColorActive: siteVariables.colors.primary[100],
backgroundColorHover: siteVariables.colors.primary[50],
backgroundColorFocus: siteVariables.colors.primary[100],
borderColor: siteVariables.colors.primary[100],
borderColorActive: siteVariables.colors.primary[200],
borderColorHover: siteVariables.colors.primary[200],
color: siteVariables.colors.brand[600],
colorActive: siteVariables.colors.brand[300],
colorHover: siteVariables.colors.brand[300],
colorFocus: siteVariables.colors.brand[900],
backgroundColor: '#252424', // no mapping color - tried - siteVariables.colors.grey[750]
backgroundColorActive: siteVariables.colors.brand[200],
backgroundColorHover: siteVariables.colors.brand[50],
backgroundColorFocus: siteVariables.colors.brand[200],
borderColor: siteVariables.colors.brand[200],
borderColorActive: siteVariables.colors.brand[300],
borderColorHover: siteVariables.colors.brand[300],
borderColorFocus: siteVariables.colors.grey[900],
borderColorFocusIndicator: siteVariables.colors.primary[900],
borderColorFocusIndicator: siteVariables.colors.brand[900],
}),
},
}}
Expand All @@ -33,19 +33,19 @@ const ButtonUsageExampleShorthand = () => (
theme={{
componentVariables: {
Button: siteVariables => ({
color: siteVariables.colors.primary[500],
colorActive: siteVariables.colors.primary[500],
colorHover: siteVariables.colors.primary[500],
colorFocus: siteVariables.colors.primary[900],
color: siteVariables.colors.brand[600],
colorActive: siteVariables.colors.brand[600],
colorHover: siteVariables.colors.brand[600],
colorFocus: siteVariables.colors.brand[900],
backgroundColor: siteVariables.colors.white,
backgroundColorActive: siteVariables.colors.primary[100],
backgroundColorHover: siteVariables.colors.primary[50],
backgroundColorFocus: siteVariables.colors.primary[100],
borderColor: siteVariables.colors.primary[100],
borderColorActive: siteVariables.colors.primary[200],
borderColorHover: siteVariables.colors.primary[200],
backgroundColorActive: siteVariables.colors.brand[200],
backgroundColorHover: siteVariables.colors.brand[50],
backgroundColorFocus: siteVariables.colors.brand[200],
borderColor: siteVariables.colors.brand[200],
borderColorActive: siteVariables.colors.brand[300],
borderColorHover: siteVariables.colors.brand[300],
borderColorFocus: siteVariables.colors.white,
borderColorFocusIndicator: siteVariables.colors.primary[900],
borderColorFocusIndicator: siteVariables.colors.brand[900],
}),
},
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const ChatExample = () => {
ChatMessage: {
root: ({ props: p, theme: { siteVariables } }) => ({
'& a': {
color: siteVariables.colors.primary[500],
color: siteVariables.colors.brand[600],
},
}),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const ChatWithPopover = () => {
ChatMessage: {
root: ({ props: p, theme: { siteVariables } }) => ({
'& a': {
color: siteVariables.colors.primary[500],
color: siteVariables.colors.brand[600],
},
}),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const items = [
key: 'message-id-8',
},
{
children: <Divider content="Today" color="primary" important />,
children: <Divider content="Today" color="brand" important />,
key: 'message-id-9',
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const ChatMessageExampleStyled = () => (
componentVariables: {
ChatMessage: siteVars => ({
content: {
focusOutlineColor: siteVars.red,
focusOutlineColor: siteVars.colors.red[400],
},
}),
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import * as React from 'react'
import { Label, Provider } from '@stardust-ui/react'
import * as _ from 'lodash'

const LabelExampleColor = () => (
<Provider.Consumer
render={({ siteVariables: { colorScheme } }) =>
Object.keys(colorScheme).map(color => (
render={({ siteVariables: { primitiveColors, emphasisColors, naturalColors } }) =>
_.keys({ ...primitiveColors, ...emphasisColors, ...naturalColors }).map(color => (
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extracting only the colors we had previously in the example

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DividerExample loops through emphasis and natural colors only (no primitive) is the difference intentional?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TextExample as well

<span key={color}>
<Label color={color} content={color} />{' '}
</span>
Expand Down

This file was deleted.

5 changes: 0 additions & 5 deletions docs/src/examples/components/Menu/Variations/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ const Variations = () => (
title="Vertical &amp; Pointing"
examplePath="components/Menu/Variations/MenuExampleVerticalPointing"
/>
<ComponentExample
title="Primary"
description="A menu can have a primary color."
examplePath="components/Menu/Variations/MenuExamplePrimary"
/>
<ComponentExample
title="Fluid"
description="A vertical menu can be fluid which takes up the full space of its container. A horizontal menu does this by default."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const ChatWithPopover = () => (
ChatMessage: {
root: ({ props: p, theme: { siteVariables } }) => ({
'& a': {
color: siteVariables.colors.primary[500],
color: siteVariables.colors.brand[600],
},
}),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const items = [
badge={{ icon: 'mention' }}
variables={siteVars => ({
hasMention: true,
hasMentionColor: siteVars.colors.primary[500],
hasMentionColor: siteVars.colors.brand[600],
})}
/>
),
Expand All @@ -86,7 +86,7 @@ const items = [
badge={{ icon: 'redbang' }}
variables={siteVars => ({
isImportant: true,
isImportantColor: siteVars.colors.yellow[900],
isImportantColor: siteVars.colors.yellow[400],
})}
/>
),
Expand Down
2 changes: 1 addition & 1 deletion docs/src/prototypes/chatPane/chatPaneHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ChatPaneHeader extends React.PureComponent<ChatPaneHeaderProps> {
height: '40px',
padding: 0,
})}
variables={siteVars => ({ backgroundColor: siteVars.colors.primary[500] })}
variables={siteVars => ({ backgroundColor: siteVars.colors.brand[600] })}
/>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export function generateChatProps(chat: ChatData): ChatItem[] {
chatProps.splice(
myLastMsgIndex + 1,
0,
generateDividerProps({ content: 'Last read', color: 'primary', important: true }),
generateDividerProps({ content: 'Last read', color: 'brand', important: true }),
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default props => {
<Provider.Consumer
render={({ siteVariables }) => {
return (
<div style={{ backgroundColor: siteVariables.colors.primary[500] }}>
<div style={{ backgroundColor: siteVariables.colors.brand[600] }}>
<div style={{ ...middleColumnStyles }}>{props.content}</div>
</div>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default props => {
return (
<Provider.Consumer
render={({ siteVariables }) => (
<Text as="a" content={content} color="primary">
<Text as="a" content={content} color="brand">
{children}
</Text>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class MSTeamsLogo extends React.Component<LogoProps, any> {
<div style={style}>
{Icon.create(icon, {
defaultProps: {
variables: { color: siteVariables.colors.primary[500] },
variables: { color: siteVariables.colors.brand[600] },
size: 'largest',
xSpacing: 'after',
styles: { verticalAlign: 'middle' },
Expand Down
Loading