Skip to content

Commit

Permalink
Removed text from logo and displayed h1. Reorganized position on scre…
Browse files Browse the repository at this point in the history
…en with vh
  • Loading branch information
Nargonath committed Jul 9, 2017
1 parent 76e943f commit 1183121
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 130 deletions.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700|Roboto" rel="stylesheet">

<title>Getshitdone</title>
</head>
Expand Down
37 changes: 28 additions & 9 deletions src/scenes/Home/Home.style.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from 'styled-components';

import { media } from 'styles';
import { media, secondaryColor } from 'styles';

export const Root = styled.div`
@font-face {
Expand All @@ -18,10 +18,16 @@ export const Root = styled.div`
font-weight: 700;
}
@font-face {
font-family: 'Roboto', sans-serif;
font-weight: 400;
}
font-family: 'Open Sans';
font-weight: 400;
padding-bottom: 70px;
font-size: 12px;
max-height: 100vh;
${media.desktop`
font-size: 14px;
Expand All @@ -30,18 +36,31 @@ export const Root = styled.div`
`};
`;

export const Logo = styled.img`
display: block;
export const LogoCtn = styled.div`
margin: 10% auto 5% auto;
width: 150px;
height: auto;
width: 7.143em;
${media.tablet`
display: inline-block;
margin: 30px 50px;
margin: 30px 50px 5vh 50px;
`} ${media.desktop`
margin-bottom: 5%;
margin-bottom: 7vh;
`} ${media.big`
margin-bottom: 10%;
margin-bottom: 18vh;
`};
`;

export const Title = styled.h1`
margin: 0;
font-family: 'Roboto';
font-weight: 400;
color: ${secondaryColor};
font-size: 1.2em;
`;

export const Logo = styled.img`
display: block;
${media.tablet`
display: inline-block;
`};
`;
8 changes: 5 additions & 3 deletions src/scenes/Home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import logo from './logo.svg';
import TimerForm from 'components/TimerForm';
import Timer from 'components/Timer';
import Footer from 'components/Footer';
import { Root, Logo } from './Home.style';
import { Root, Logo, LogoCtn, Title } from './Home.style';

class Home extends Component {
constructor(props) {
Expand Down Expand Up @@ -38,8 +38,10 @@ class Home extends Component {
render() {
return (
<Root>
<Logo src={logo} alt="getshitdone logo timer task" />
<h1 hidden>Getshitdone</h1>
<LogoCtn>
<Logo src={logo} alt="getshitdone logo timer task" />
<Title>Get shit done</Title>
</LogoCtn>

{this.state.task === null
? <TimerForm onValidate={this.onTaskCreation} />
Expand Down
118 changes: 1 addition & 117 deletions src/scenes/Home/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1183121

Please sign in to comment.