Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified typography, layout and button styles #382

Merged
merged 3 commits into from
Oct 6, 2017
Merged

Modified typography, layout and button styles #382

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ee6570
Modified typography, layout and button styles
norbertdragan Oct 5, 2017
9db1a12
Ran npm lint
norbertdragan Oct 6, 2017
7141b75
Run yarn lint
Oct 6, 2017
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
30 changes: 20 additions & 10 deletions packages/site/src/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,27 @@ const Paragraph = Box.withComponent('p')

const stringCode = `const Link = styled.a\`
display: inline-block;
border-radius: 8px;
border-radius: 5px;
padding: 16px;
margin: 16px;
margin: 1rem 0;
width: 12rem;
background: \${props =>
props.primary &&
'linear-gradient(90deg, #D26AC2, #46C9E5)'};
text-decoration: none;
color: \${props =>
props.primary ? '#1D2029' : '#D26AC2'};

&:hover {
opacity: 0.95;
}
\``

const objectCode = `const Link = styled.a(props => ({
display: 'inline-block',
borderRadius: 8,
borderRadius: 5,
padding: 16,
margin: 16,
margin: '1rem 0',
width: '12rem',
background:
props.primary &&
Expand All @@ -51,7 +55,7 @@ const Preview = withLive(({ live: { element: BaseLink, onError, error } }) => {
>
Install
</Link>
<Link className={textCenter} to="/docs">
<Link css={`margin-left: 20px;`} className={textCenter} to="/docs">
Getting Started
</Link>
</ErrorBoundary>
Expand Down Expand Up @@ -134,16 +138,22 @@ class IndexPage extends React.Component {
/>
<Title
display="inline-block"
fontSize={8}
m={0}
className={css`font-weight: 300;`}
fontSize={'1.6rem'}
m={'0 0 0 0.4rem'}
className={css`font-weight: 700;`}
>
emotion
</Title>
<Paragraph fontSize={4}>
<Paragraph
css={{ fontWeight: 700, margin: '1em 0 0.5em 0' }}
fontSize={5}
>
The Next Generation of CSS-in-JS
</Paragraph>
<Paragraph css={{ fontWeight: 300 }} fontSize={2}>
<Paragraph
css={{ fontWeight: 300, lineHeight: '1.5rem' }}
fontSize={'1.15rem'}
>
{/* just putting this here until we write an up to date intro */}
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Pellentesque condimentum urna imperdiet lectus convallis, quis
Expand Down