git ssb - Adjusting styles and creating new content

Commit 0e93588fd3c0c1d00dd874bd6b984a2f3b027790

Adjusting styles and creating new content

Rômulo Alves committed on 11/8/2016, 9:43:42 AM
Parent: 994b7b81aefebcc50a030d69f1bf4f8292ded369

Files changed

_components/common/globalStyles.js	changed
_components/jobs/Content.js	changed
_components/talks/Content.js	added
pages/index.js	changed
pages/talks.js	added

_components/common/globalStyles.jsView
		@@ -7,5 +7,22 @@
7	7	body {
8	8	font-family: Menlo, Monaco, Consolas;
9	9	min-height: 100%;
10	10	}
	11	+ .container {
	12	+ margin: 0 auto;
	13	+ width: 600px
	14	+ }
	15	+
	16	+ @media (max-width: 768px) {
	17	+ .container {
	18	+ width: 300px;
	19	+ }
	20	+ }
	21	+
	22	+ @media (max-width: 375px) {
	23	+ .container {
	24	+ padding: 0 20px;
	25	+ width: auto;
	26	+ }
	27	+ }
11	28	`;

_components/jobs/Content.jsView
		@@ -8,32 +8,29 @@
8	8	import Anchor from '../common/Anchor';
9	9
10	10	export default () => (
11	11	<Content>
12		- <div className={contentStyle}>
	12	+ <div className="container">
13	13	<Link href="/jobs">
14	14	<h1 className={titleStyle}>
15	15	Jobs
16	16	</h1>
17	17	</Link>
18	18	<ul>
19	19	<li className={listStyle}>
20		- > from 12/2011 to now - Web developer<br />
21		- <Anchor href="http://www.cwi.com.br/" title="cwi software">
22		- CWI Software
23		- </Anchor>
	20	+ > from 12/2011 to now - <Anchor href="http://www.cwi.com.br/" title="cwi software">CWI Software</Anchor>
	21	+ <br />
	22	+ Web developer
24	23	</li>
25	24	<li className={listStyle}>
26		- > from 10/2011 to 12/2012 - Web developer<br />
27		- <Anchor href="http://www.brivia.com.br/" title="brivia">
28		- Brivia
29		- </Anchor>
	25	+ > from 10/2011 to 12/2012 - <Anchor href="http://www.brivia.com.br/" title="brivia">Brivia</Anchor>
	26	+ <br />
	27	+ Web developer
30	28	</li>
31	29	<li className={listStyle}>
32		- > from 02/2011 to 10/2011 - Intern web developer<br />
33		- <Anchor href="http://www.brivia.com.br/" title="brivia">
34		- Brivia
35		- </Anchor>
	30	+ > from 02/2011 to 10/2011 - <Anchor href="http://www.brivia.com.br/" title="brivia">Brivia</Anchor>
	31	+ <br />
	32	+ Intern web developer
36	33	</li>
37	34	</ul>
38	35	</div>
39	36	</Content>
		@@ -43,14 +40,8 @@
43	40	color: '#000',
44	41	marginBottom: '10px'
45	42	});
46	43
47		-const contentStyle = css({
48		- margin: '0 auto',
49		- textAlign: 'center',
50		- width: '300px'
51		-});
52		-
53	44	const listStyle = css({
54	45	fontSize: '10pt',
55	46	listStyle: 'none',
56	47	marginBottom: '20px',

_components/talks/Content.jsView
		@@ -1,0 +1,39 @@
	1	+// Packages
	2	+import React from 'react';
	3	+import css from 'next/css';
	4	+import Link from 'next/link';
	5	+
	6	+// Components
	7	+import Content from '../common/Content';
	8	+import Anchor from '../common/Anchor';
	9	+
	10	+export default () => (
	11	+ <Content>
	12	+ <div className="container">
	13	+ <Link href="/talks">
	14	+ <h1 className={titleStyle}>
	15	+ Talks
	16	+ </h1>
	17	+ </Link>
	18	+ <ul>
	19	+ <li className={listStyle}>
	20	+ <Anchor href="https://speakerdeck.com/romuloalves/componentizando-suas-views-com-react" title="Dojo React at CWI Software">
	21	+ Dojo React at @cwisoftware
	22	+ </Anchor>
	23	+ </li>
	24	+ </ul>
	25	+ </div>
	26	+ </Content>
	27	+);
	28	+
	29	+const titleStyle = css({
	30	+ color: '#000',
	31	+ marginBottom: '10px'
	32	+});
	33	+
	34	+const listStyle = css({
	35	+ fontSize: '10pt',
	36	+ listStyle: 'none',
	37	+ marginBottom: '20px',
	38	+ textAlign: 'left'
	39	+});

pages/index.jsView
		@@ -10,31 +10,27 @@
10	10	// Components/Page
11	11	import Header from '../_components/index/Header';
12	12	import NavBar from '../_components/index/NavBar';
13	13	import JobsContent from '../_components/jobs/Content';
	14	+import TalksContent from '../_components/talks/Content';
14	15
15	16	export default () => (
16	17	<div>
17	18	<Head />
18	19	<Header />
19	20	<NavBar />
20	21	<Content>
21		- <div className={contentStyle}>
22		- <h1 className={titleStyle}>Where am I?</h1>
	22	+ <div className="container">
	23	+ <h1 className={titleStyle}>Where I am?</h1>
23	24	<Anchor href="https://www.google.com.br/maps/place/Sapiranga,+RS/@-29.6410773,-51.0112617,14z/data=!3m1!4b1!4m5!3m4!1s0x95193f737e8194df:0x571f590faf537198!8m2!3d-29.6353852!4d-51.0069543?hl=en" title="Sapiranga, Rio Grande do Sul, Brazil">
24	25	Sapiranga, Rio Grande do Sul, Brazil
25	26	</Anchor>
26	27	</div>
27	28	</Content>
28	29	<JobsContent />
	30	+ <TalksContent />
29	31	</div>
30	32	);
31	33
32	34	const titleStyle = css({
33	35	marginBottom: '10px'
34	36	});
35		-
36		-const contentStyle = css({
37		- margin: '0 auto',
38		- textAlign: 'center',
39		- width: '300px'
40		-});

pages/talks.jsView
		@@ -1,0 +1,22 @@
	1	+// Packages
	2	+import React from 'react';
	3	+import css from 'next/css';
	4	+
	5	+// Components/Common
	6	+import Head from '../_components/common/Head';
	7	+import Content from '../_components/common/Content';
	8	+import Anchor from '../_components/common/Anchor';
	9	+
	10	+// Components/Page
	11	+import Header from '../_components/index/Header';
	12	+import NavBar from '../_components/index/NavBar';
	13	+import TalksContent from '../_components/talks/Content';
	14	+
	15	+export default () => (
	16	+ <div>
	17	+ <Head title="talks" />
	18	+ <Header />
	19	+ <NavBar />
	20	+ <TalksContent />
	21	+ </div>
	22	+);

Built with git-ssb-web

Rômulo Alves / website

Commit 0e93588fd3c0c1d00dd874bd6b984a2f3b027790

Adjusting styles and creating new content

Files changed