Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import styled from 'styled-components';
import styled, { injectGlobal } from 'styled-components';
import TopBar from './components/TopBar';
import WorkshopForm from './components/WorkshopForm';
import Header from './components/Header';
Expand All @@ -26,4 +26,13 @@ const Main = styled.main`
}
`;

/* eslint no-unused-expressions: 0 */
injectGlobal`
@import url('https://fonts.googleapis.com/css?family=Lato');

body {
font-family: 'Lato', Sans-Serif;
}
`;

export default App;
2 changes: 1 addition & 1 deletion src/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Header extends Component {
render() {
return (
<Section>
<Text type="primary">Stwórz Workshop!</Text>
<Text type='header'>Stwórz Workshop!</Text>
<Text>
Scratch the furniture i like big cats and i can not lie.
Making sure that fluff gets into the owner's eyes ask for
Expand Down
8 changes: 7 additions & 1 deletion src/components/Text.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ const style = {
default: {
fontSize: '12',
color: Colors.grey
}
},
header: {
fontFamily: 'Lato sans-serif',
fontSize: '35',
fontWeight: 'bold',
color: '#464646'
},
};

const StyledText = styled.p`
Expand Down
2 changes: 1 addition & 1 deletion src/styles/Colors.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const Colors = {
black: '#000',
red: '#F7302F',
yellow: '#FAE452',
grey: '#aaa',
grey: '#464646',
};

export default Colors;