Skip to content

Commit 07eb596

Browse files
author
Dominic Nguyen
authored
Merge pull request #402 from storybookjs/update-fonts
Remove heaviest font-weight (black)
2 parents 6841c83 + bdb0ec1 commit 07eb596

10 files changed

Lines changed: 12 additions & 11 deletions

File tree

src/components/ShadowBoxCTA.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const TextWrapper = styled.div`
3232

3333
const HeadingText = styled.div`
3434
font-size: ${typography.size.s3}px;
35-
font-weight: ${typography.weight.black};
35+
font-weight: ${typography.weight.bold};
3636
`;
3737

3838
const MessageText = styled.div`

src/components/Subheading.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const StyledSubheading = styled('span', { shouldForwardProp: (prop) => !['muted'
66
Partial<SubheadingProps>
77
>`
88
font-size: ${typography.size.s2 - 1}px;
9-
font-weight: ${typography.weight.black};
9+
font-weight: ${typography.weight.extrabold};
1010
letter-spacing: 0.35em;
1111
text-transform: uppercase;
1212

src/components/header/NavLink.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { HeaderContext } from './HeaderContext';
66

77
const StyledNavLink = styled(Link)`
88
font-size: ${typography.size.s2}px;
9-
font-weight: ${typography.weight.extrabold};
9+
font-weight: ${typography.weight.bold};
1010
`;
1111

1212
type NavLinkProps = ComponentProps<typeof Link>;
@@ -17,3 +17,5 @@ export const NavLink = forwardRef<HTMLAnchorElement | HTMLButtonElement, NavLink
1717
return <StyledNavLink ref={ref} inverse={inverse} tertiary={!inverse} {...props} />;
1818
}
1919
);
20+
21+
NavLink.displayName = 'NavLink';

src/components/marketing/DisplayCard/DisplayCard.styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ type TitleProps = {
7474
};
7575

7676
export const Title = styled.div<TitleProps>`
77-
font-weight: ${typography.weight.black};
77+
font-weight: ${typography.weight.bold};
7878
font-size: ${typography.size.s3}px;
7979
line-height: ${typography.size.m2}px;
8080
color: ${color.darker};

src/components/marketing/Heading.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { typography, color, breakpoint } from '../shared/styles';
55
export const StyledHeading = styled.h2`
66
color: ${color.darkest};
77
font-size: ${typography.size.m3}px;
8-
font-weight: ${typography.weight.black};
8+
font-weight: ${typography.weight.bold};
99
letter-spacing: -0.29px;
1010
line-height: ${typography.size.l2}px;
1111
margin-bottom: 4px;

src/components/marketing/PageFooter/PageFooter.styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const Title = styled(Subheading)`
2121
`;
2222

2323
export const ResourceTitle = styled.div`
24-
font-weight: ${typography.weight.extrabold};
24+
font-weight: ${typography.weight.bold};
2525
margin-bottom: 0.25rem;
2626
`;
2727

src/components/marketing/Title.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { styled } from '@storybook/theming';
33
import { typography, color } from '../shared/styles';
44

55
const StyledTitle = styled.h3`
6-
font-weight: ${typography.weight.black};
6+
font-weight: ${typography.weight.bold};
77
font-size: ${typography.size.m2}px;
88
line-height: ${typography.size.m3}px;
99
color: ${color.darkest};

src/components/shared/global.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export const bodyStyles = css`
120120
// Allow design system consumers to access font settings but control how and
121121
// where they load the font.
122122
export const fontUrl =
123-
'https://fonts.googleapis.com/css?family=Nunito+Sans:400,700,800,900&display=swap';
123+
'https://fonts.googleapis.com/css?family=Nunito+Sans:400,700,800&display=swap';
124124

125125
const globalStyles = css`
126126
body {

src/components/shared/styles.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export const typography = {
7272
regular: '400',
7373
bold: '700',
7474
extrabold: '800',
75-
black: '900',
7675
},
7776
size: {
7877
s1: 12,

src/components/tooltip/TooltipMessage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { color, typography } from '../shared/styles';
55
import { Link } from '../Link';
66

77
const Title = styled.div`
8-
font-weight: ${typography.weight.black};
8+
font-weight: ${typography.weight.bold};
99
`;
1010

1111
const Desc = styled.span``;
@@ -16,7 +16,7 @@ const Links = styled.div`
1616
1717
> * {
1818
margin: 0 8px;
19-
font-weight: ${typography.weight.black};
19+
font-weight: ${typography.weight.bold};
2020
}
2121
`;
2222

0 commit comments

Comments
 (0)