Skip to content
This repository was archived by the owner on Sep 26, 2024. It is now read-only.

Commit e9e216a

Browse files
authored
Fix/font family (#103)
* remove setting font family on all the things * update Button story to use Text component * add fontFamily to Link * update snapshots
1 parent 29bb918 commit e9e216a

File tree

4 files changed

+63
-8
lines changed

4 files changed

+63
-8
lines changed

.storybook/head.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
11
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,800" rel="stylesheet">
2-
<style>
3-
* {
4-
font-family: 'Open Sans', sans-serif;
5-
}
6-
</style>

Button/story.jsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
import { checkA11y } from 'storybook-addon-a11y';
77
import Button from './index';
88
import CloseIcon from '../Icon/Icons/CloseIcon';
9+
import Text from '../Text';
910

1011
storiesOf('Button')
1112
.addDecorator(checkA11y)
@@ -16,7 +17,10 @@ storiesOf('Button')
1617
<Button onClick={action('on-click')} warning>Warning</Button>
1718
))
1819
.add('with icon and text', () => (
19-
<Button onClick={action('on-click')} noStyle><CloseIcon />Close</Button>
20+
<Button onClick={action('on-click')} noStyle>
21+
<CloseIcon />
22+
<Text>Close</Text>
23+
</Button>
2024
))
2125
.add('with icon only', () => (
2226
<Button onClick={action('on-click')} noStyle><CloseIcon /></Button>

LinkStateless/index.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ import {
77
curiousBlue,
88
denim,
99
} from '../style/color';
10-
1110
import {
1211
focusedStyle,
1312
} from '../style/focused';
13+
import {
14+
fontFamily,
15+
} from '../style/font';
1416

1517
const Link = ({
1618
children,
@@ -27,6 +29,7 @@ const Link = ({
2729
const style = calculateStyles({
2830
default: {
2931
color: curiousBlue,
32+
fontFamily,
3033
},
3134
hovered: {
3235
color: denim,

0 commit comments

Comments
 (0)