Skip to content

Commit 4c100b7

Browse files
author
Nadiia Dmytrenko
committed
feat(theme): use newly added semantic color tokens
1 parent 4ebed3e commit 4c100b7

58 files changed

Lines changed: 248 additions & 236 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

documentation-site/components/blog.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const Image = themedStyled('img', props => ({
2121
}));
2222

2323
export const Caption = themedStyled('figcaption', ({$theme}) => ({
24-
color: $theme.colors.foregroundAlt,
24+
color: $theme.colors.contentSecondary,
2525
fontFamily: $theme.typography.font100.fontFamily,
2626
fontSize: $theme.sizing.scale500,
2727
fontWeight: 300,
@@ -48,22 +48,22 @@ export const Demo = themedStyled('iframe', {
4848
});
4949

5050
const Tagline = themedStyled('span', ({$theme}) => ({
51-
color: $theme.colors.foregroundAlt,
51+
color: $theme.colors.contentSecondary,
5252
fontFamily: $theme.typography.font100.fontFamily,
5353
fontSize: $theme.sizing.scale800,
5454
fontWeight: 300,
5555
}));
5656

5757
const AuthorLink = themedStyled('a', ({$theme}) => ({
58-
color: $theme.colors.foregroundAlt,
58+
color: $theme.colors.contentSecondary,
5959
fontFamily: $theme.typography.font100.fontFamily,
6060
':hover': {
61-
color: $theme.colors.foreground,
61+
color: $theme.colors.contentPrimary,
6262
},
6363
}));
6464

6565
const ArticleDate = themedStyled('span', ({$theme}) => ({
66-
color: $theme.colors.foregroundAlt,
66+
color: $theme.colors.contentSecondary,
6767
}));
6868

6969
export const Meta = ({
@@ -121,7 +121,7 @@ export const Meta = ({
121121
overrides={{
122122
Block: {
123123
style: ({$theme}) => ({
124-
color: $theme.colors.foregroundAlt,
124+
color: $theme.colors.contentSecondary,
125125
fontFamily: $theme.typography.font100.fontFamily,
126126
margin: `${$theme.sizing.scale400} 0`,
127127
}),

documentation-site/components/example.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class Example extends React.Component<PropsT, StateT> {
118118
marginBottom: 0,
119119
boxShadow: 'none',
120120
borderWidth: 0,
121-
backgroundColor: $theme.colors.background,
121+
backgroundColor: $theme.colors.backgroundPrimary,
122122
}),
123123
},
124124
Contents: {

documentation-site/components/footer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const StyledFooter = themedStyled<{}>(
3232
...typography.font300,
3333
position: 'sticky',
3434
bottom: 0,
35-
color: colors.foreground,
35+
color: colors.contentPrimary,
3636
backgroundColor: name.startsWith('light-theme')
3737
? colors.mono200
3838
: colors.headerNavigationFill,
@@ -46,7 +46,7 @@ const StyledFooter = themedStyled<{}>(
4646

4747
const StyledLink = themedStyled('a', ({$theme}) => ({
4848
textDecoration: 'none',
49-
color: $theme.colors.foreground,
49+
color: $theme.colors.contentPrimary,
5050
display: 'inline-block',
5151
cursor: 'pointer',
5252
marginLeft: '32px',

documentation-site/components/gallery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ function Thumbnail({children, href}) {
267267
borderTop: 0,
268268
borderLeft: 0,
269269
borderRight: 0,
270-
color: `${theme.colors.foregroundAlt}`,
270+
color: `${theme.colors.contentSecondary}`,
271271
paddingTop: theme.sizing.scale300,
272272
paddingBottom: theme.sizing.scale300,
273273
paddingLeft: theme.sizing.scale500,

documentation-site/components/header-navigation.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const Navigation = ({toggleSidebar, toggleTheme, toggleDirection}: PropsT) => {
160160
$style={{textDecoration: 'none'}}
161161
target="_blank"
162162
>
163-
<SlackLogo size={24} color={theme.colors.foreground} />
163+
<SlackLogo size={24} color={theme.colors.contentPrimary} />
164164
</Block>
165165
<Block
166166
$as="a"
@@ -180,7 +180,7 @@ const Navigation = ({toggleSidebar, toggleTheme, toggleDirection}: PropsT) => {
180180
$style={{textDecoration: 'none'}}
181181
target="_blank"
182182
>
183-
<GithubLogo size={24} color={theme.colors.foreground} />
183+
<GithubLogo size={24} color={theme.colors.contentPrimary} />
184184
</Block>
185185
<Block
186186
as="span"
@@ -202,9 +202,15 @@ const Navigation = ({toggleSidebar, toggleTheme, toggleDirection}: PropsT) => {
202202
}}
203203
>
204204
{theme.direction === 'rtl' ? (
205-
<AlignLeftIcon size={24} color={theme.colors.foreground} />
205+
<AlignLeftIcon
206+
size={24}
207+
color={theme.colors.contentPrimary}
208+
/>
206209
) : (
207-
<AlignRightIcon size={24} color={theme.colors.foreground} />
210+
<AlignRightIcon
211+
size={24}
212+
color={theme.colors.contentPrimary}
213+
/>
208214
)}
209215
</Block>
210216
<Block
@@ -228,12 +234,12 @@ const Navigation = ({toggleSidebar, toggleTheme, toggleDirection}: PropsT) => {
228234
accessibilityType={'tooltip'}
229235
>
230236
<Block as="span" font="font300">
231-
<Bulb size={24} color={theme.colors.foreground} />
237+
<Bulb size={24} color={theme.colors.contentPrimary} />
232238
</Block>
233239
</StatefulTooltip>
234240
</Block>
235241
<Hamburger role="button" onClick={toggleSidebar}>
236-
<Menu size={32} color={theme.colors.foregroundAlt} />
242+
<Menu size={32} color={theme.colors.contentSecondary} />
237243
</Hamburger>
238244
</Block>
239245
</NavigationList>

documentation-site/components/help.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const Help = () => {
2020
right: theme.sizing.scale2400,
2121
boxShadow: theme.lighting.shadow400,
2222
padding: theme.sizing.scale400,
23-
backgroundColor: theme.colors.background,
23+
backgroundColor: theme.colors.backgroundPrimary,
2424
display: 'none',
2525
[theme.mediaQuery.medium]: {
2626
display: 'block',

documentation-site/components/layout.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ class Layout extends React.Component<PropsT, {sidebarOpen: boolean}> {
142142
toggleDirection={toggleDirection}
143143
/>
144144
<Block
145-
backgroundColor="background"
146-
color="foreground"
145+
backgroundColor="backgroundPrimary"
146+
color="contentPrimary"
147147
marginTop="scale300"
148148
display="flex"
149149
paddingTop="scale400"

documentation-site/components/posts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {themedStyled} from '../pages/_app';
1515
import posts from '../posts';
1616

1717
const MetaData = themedStyled('h2', ({$theme}) => ({
18-
color: $theme.colors.foregroundAlt,
18+
color: $theme.colors.contentSecondary,
1919
fontFamily: $theme.typography.font100.fontFamily,
2020
fontSize: $theme.sizing.scale500,
2121
lineHeight: $theme.sizing.scale600,

documentation-site/components/sidebar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const StyledNavItem = withStyle(NavItem, ({$theme, $active}) => {
2020

2121
if ($theme.name.startsWith('dark')) {
2222
if ($active) {
23-
styleOverride.background = $theme.colors.backgroundAlt;
23+
styleOverride.background = $theme.colors.backgroundSecondary;
2424
}
2525
}
2626
return {

documentation-site/components/table-of-contents.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const TableOfContents = props => {
9292
})}
9393
>
9494
<a
95-
className={css({color: theme.colors.foregroundAlt})}
95+
className={css({color: theme.colors.contentSecondary})}
9696
href={header.anchor}
9797
>
9898
{header.name}

0 commit comments

Comments
 (0)