Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updating base and wrapping input in Base element in storybook

Browse Source
This commit is contained in:
Alex Windett 2017-01-10 14:51:11 +00:00
parent a820655eb0
commit c31d08a15c
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/src/components/base/index.js
View File

@ -7,7 +7,8 @@ const {
forms, forms,
links, links,
tables, tables,
typography typography,
colors
} = constants; } = constants;
const { const {
@ -36,7 +37,7 @@ module.exports = styled.div`
"Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
color: #373A3C; color: ${colors.fonts.regular};
background-color: #FFFFFF; background-color: #FFFFFF;
/************************************************************************** /**************************************************************************

2
ui/src/shared/constants/colors.js
View File

@ -48,7 +48,7 @@ const colors = {
...brandInactive, ...brandInactive,
...notifications, ...notifications,
...metrics, ...metrics,
...fonts fonts
}; };
module.exports = colors; module.exports = colors;

4
ui/stories/index.js
View File

@ -217,9 +217,12 @@ storiesOf('Radio', module)
storiesOf('Input', module) storiesOf('Input', module)
.add('Default', () => ( .add('Default', () => (
<Base>
<Input placeholder="I am the placeholder" /> <Input placeholder="I am the placeholder" />
</Base>
)) ))
.add('type=email', () => ( .add('type=email', () => (
<Base>
<Input <Input
label='Email Address' label='Email Address'
placeholder='Enter email' placeholder='Enter email'
@ -227,6 +230,7 @@ storiesOf('Input', module)
> >
<small>We&apos;ll never share your email with anyone else.</small> <small>We&apos;ll never share your email with anyone else.</small>
</Input> </Input>
</Base>
)); ));
storiesOf('Modal', module) storiesOf('Modal', module)