Skip to content

Commit 0e45a94

Browse files
authored
(site) Update color scheme (#196)
Use emerald green as main color with a light purple for some accent/link hovering. Additionally, update `Header` and `Footer` component. * Update header to always fetch SiteName Originally, I didn't have the SiteName in the headers on the home page. Due to the size of the site name, this would cause the other elements to shift when switching between the home page and other pages on the site. Instead, we will now always include the site name to keep the header standard. Since we are now keeping the site name, we could move the `StaticQuery` to fetch it from the Gatsby site metadata out of the `Layout` and into the header itself. * Update the footer to better leverage flexbox
1 parent 1b31c28 commit 0e45a94

File tree

9 files changed

+107
-185
lines changed

9 files changed

+107
-185
lines changed

content/data/talks.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"presentationDate": { "year": 2014, "month": 2 }
1919
},
2020
{
21-
"description": "This talk was given during a UCF ACM meeting. It starts with a quick introduction to the syntax of Ruby but the bulk of the talk was walking through creating a demo Rails application. The walkthrough for the demo Rails application can be found <a href='https://gist.github.com/tmr08c/102cacf255d09e2122ce' class='border-solid border-red-200 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>here</a>. The application is an attendance app that allows meetings to be created and users to sign in as having attended a meeting.",
21+
"description": "This talk was given during a UCF ACM meeting. It starts with a quick introduction to the syntax of Ruby but the bulk of the talk was walking through creating a demo Rails application. The walkthrough for the demo Rails application can be found <a href='https://gist.github.com/tmr08c/102cacf255d09e2122ce' class='border-solid hover:text-purple-400 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>here</a>. The application is an attendance app that allows meetings to be created and users to sign in as having attended a meeting.",
2222
"name": "Creating a Ruby on Rails Application - A Brief Introduction to Magic",
2323
"presentationDate": { "year": 2014, "month": 10 }
2424
}
@@ -30,13 +30,13 @@
3030
{
3131
"name": "An Introduction to Ruby…with a functional perspective",
3232
"link": "https://docs.google.com/presentation/d/1_RjmWwWcQIodywIDzq92JhejtG7GGSyWCAfd1b-0rGw/edit?usp=sharing",
33-
"description": "This talk was given as a guest lecture in a <a href='http://www.eecs.ucf.edu/~leavens/COP4020/' class='border-solid border-red-200 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>Programming Languages course at UCF</a>. This course has a large focus on the functional programming paradigm so it was asked to include some of these paradigms in my introduction to Ruby. This talk cover Ruby basics, functional programming with Ruby, object-oriented programming with Ruby, and metaprogramming.",
33+
"description": "This talk was given as a guest lecture in a <a href='http://www.eecs.ucf.edu/~leavens/COP4020/' class='border-solid hover:text-purple-400 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>Programming Languages course at UCF</a>. This course has a large focus on the functional programming paradigm so it was asked to include some of these paradigms in my introduction to Ruby. This talk cover Ruby basics, functional programming with Ruby, object-oriented programming with Ruby, and metaprogramming.",
3434
"presentationDate": { "year": 2015, "month": 3 }
3535
},
3636
{
3737
"name": "Couch To 5K Your Career",
3838
"link": "https://docs.google.com/presentation/d/1hMABDuoPNcRz75Rt2dGHLhntjrFbG_XH2dHXUiJ8yV8/edit?usp=sharing",
39-
"description": "This talk was given during <a href='http://barcamporlando.org/' class='border-solid border-red-200 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>BarCamp Orlando</a>. Inspired by completing the <a href='http://www.c25k.com/' class='border-solid border-red-200 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>Couch To 5K Program</a> I explore following a similar model to excel in your career. Discusses creating achievable, incremental goals in a measurable manner and the effect that has on actually following through with them.",
39+
"description": "This talk was given during <a href='http://barcamporlando.org/' class='border-solid hover:text-purple-400 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>BarCamp Orlando</a>. Inspired by completing the <a href='http://www.c25k.com/' class='border-solid hover:text-purple-400 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>Couch To 5K Program</a> I explore following a similar model to excel in your career. Discusses creating achievable, incremental goals in a measurable manner and the effect that has on actually following through with them.",
4040
"presentationDate": { "year": 2015, "month": 4 }
4141
}
4242
]
@@ -47,7 +47,7 @@
4747
{
4848
"name": "Building a Function as a Service with TypeScript",
4949
"link": "https://www.icloud.com/keynote/0NVf0OADqbNQtreCtb2Y4vC4A#Building_a_Function_as_a_Service_with_TypeScript",
50-
"description": "This talk was given at a meeting for the <a href='https://www.ncsu.edu/' class='border-solid border-red-200 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>North Carolina State University’s</a> <a href='https://acm-ncsu.github.io/about/' class='border-solid border-red-200 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>ACM chapter</a>. The talk covers some of the history of DevOps at ROI Revolution and why we are excited about the idea serverless/Faas. You can also find sample code <a href='https://github.com/tmr08c/faas-with-typescript' class='border-solid border-red-200 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>here</a>.",
50+
"description": "This talk was given at a meeting for the <a href='https://www.ncsu.edu/' class='border-solid hover:text-purple-400 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>North Carolina State University’s</a> <a href='https://acm-ncsu.github.io/about/' class='border-solid hover:text-purple-400 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>ACM chapter</a>. The talk covers some of the history of DevOps at ROI Revolution and why we are excited about the idea serverless/FaaS. You can also find sample code <a href='https://github.com/tmr08c/faas-with-typescript' class='border-solid hover:text-purple-400 border-b-2' target='_blank' rel='nofollow noopener noreferrer'>here</a>.",
5151
"presentationDate": {
5252
"year": 2018,
5353
"month": 4

src/components/Footer.tsx

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
import { Link } from "gatsby";
22
import * as React from "react";
33

4-
const Footer: React.SFC = () => (
5-
<div className="flex py-4 bg-living-coral-500 text-gray-800">
6-
<ul className="flex-grow pl-5 my-auto">
7-
<li>
8-
<Link to="/" className="hover:text-white">
4+
function Footer() {
5+
return (
6+
<div className="flex justify-between py-4 px-1 bg-green-800 text-white">
7+
<div className="flex flex-col pl-5 my-auto">
8+
<Link to="/" className="hover:text-black">
99
Home
1010
</Link>
11-
</li>
12-
<li className="group">
13-
<a href="https://github.com/tmr08c/" target="blank">
14-
{/* GitHub Logo SVG generated from Jekyll version of blog */}
15-
<svg
16-
viewBox="0 0 16 16"
17-
className="w-5 h-5 inline fill-current group-hover:text-white"
11+
<div className="group">
12+
<a
13+
href="https://github.com/tmr08c/"
14+
target="blank"
15+
className="group-hover:text-black"
1816
>
19-
<path d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z" />
20-
</svg>
21-
<span className="text-sm ml-1 group-hover:text-white">@tmr08c</span>
22-
</a>
23-
</li>
24-
</ul>
25-
<div className="flex flex-col items-end pr-5 my-auto">
26-
<Link to="/talks" className="hover:text-white">
27-
Talks
28-
</Link>
29-
<div className="flex items-center">
30-
<Link to="/rss.xml" className="hover:text-white mr-3">
31-
{/* Logo thanks to https://www.svgrepo.com/svg/95552/rss-sign */}
32-
<svg viewBox="0 0 461.432 461.432" className="h-3 w-3 fill-current">
33-
<defs />
34-
<path d="M125.896 398.928c0 33.683-27.308 60.999-61.022 60.999-33.684 0-61.006-27.316-61.006-60.999 0-33.729 27.322-61.038 61.006-61.038 33.714 0 61.022 27.308 61.022 61.038zM0 229.636c0 8.441 6.606 15.379 15.036 15.809 60.318 3.076 100.885 25.031 138.248 62.582 36.716 36.864 60.071 89.759 64.082 137.769.686 8.202 7.539 14.524 15.77 14.524h56.701c4.344 0 8.498-1.784 11.488-4.935a15.852 15.852 0 004.333-11.729c-8.074-158.152-130.669-278.332-289.013-286.23a15.846 15.846 0 00-11.709 4.344A15.848 15.848 0 000 173.247v56.389z" />
35-
<path d="M0 73.411c0 8.51 6.713 15.482 15.216 15.819 194.21 7.683 350.315 161.798 358.098 355.879.34 8.491 7.32 15.208 15.818 15.208h56.457c4.297 0 8.408-1.744 11.393-4.834a15.857 15.857 0 004.441-11.552C453.181 199.412 261.024 9.27 16.38 1.121A15.844 15.844 0 004.838 5.568 15.842 15.842 0 000 16.954v56.457z" />
36-
</svg>
37-
</Link>
38-
<Link to="/blog" className="hover:text-white">
39-
Blog
17+
{/* GitHub Logo SVG generated from Jekyll version of blog */}
18+
<svg viewBox="0 0 16 16" className="w-5 h-5 inline fill-current">
19+
<path d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z" />
20+
</svg>
21+
<span className="text-sm ml-1 group-hover:text-black">@tmr08c</span>
22+
</a>
23+
</div>
24+
</div>
25+
<div className="flex flex-col items-end pr-5 my-auto">
26+
<Link to="/talks" className="hover:text-black">
27+
Talks
4028
</Link>
29+
<div className="flex items-center">
30+
<Link to="/rss.xml" className="mr-3 hover:text-black">
31+
{/* Logo thanks to https://www.svgrepo.com/svg/95552/rss-sign */}
32+
<svg viewBox="0 0 461.432 461.432" className="h-3 w-3 fill-current">
33+
<defs />
34+
<path d="M125.896 398.928c0 33.683-27.308 60.999-61.022 60.999-33.684 0-61.006-27.316-61.006-60.999 0-33.729 27.322-61.038 61.006-61.038 33.714 0 61.022 27.308 61.022 61.038zM0 229.636c0 8.441 6.606 15.379 15.036 15.809 60.318 3.076 100.885 25.031 138.248 62.582 36.716 36.864 60.071 89.759 64.082 137.769.686 8.202 7.539 14.524 15.77 14.524h56.701c4.344 0 8.498-1.784 11.488-4.935a15.852 15.852 0 004.333-11.729c-8.074-158.152-130.669-278.332-289.013-286.23a15.846 15.846 0 00-11.709 4.344A15.848 15.848 0 000 173.247v56.389z" />
35+
<path d="M0 73.411c0 8.51 6.713 15.482 15.216 15.819 194.21 7.683 350.315 161.798 358.098 355.879.34 8.491 7.32 15.208 15.818 15.208h56.457c4.297 0 8.408-1.744 11.393-4.834a15.857 15.857 0 004.441-11.552C453.181 199.412 261.024 9.27 16.38 1.121A15.844 15.844 0 004.838 5.568 15.842 15.842 0 000 16.954v56.457z" />
36+
</svg>
37+
</Link>
38+
<Link to="/blog" className="hover:text-black">
39+
Blog
40+
</Link>
41+
</div>
4142
</div>
4243
</div>
43-
</div>
44-
);
44+
);
45+
}
4546
export default Footer;

src/components/Header.tsx

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,43 @@
1-
import { Link } from "gatsby";
1+
import { Link, StaticQuery, graphql } from "gatsby";
22
import * as React from "react";
33

4-
interface HeaderProps {
5-
siteTitle?: string;
6-
}
7-
8-
const Header: React.SFC<HeaderProps> = ({ siteTitle }) => (
9-
<nav className="flex items-center justify-between flex-wrap bg-living-coral-500 p-6 mb-5">
10-
<div className="flex flex-no-shrink">
11-
<Link
12-
to="/"
13-
className="font-semibold text-xl tracking-tighter text-black hover:text-white"
14-
>
15-
{siteTitle}
16-
</Link>
17-
</div>
18-
<div className="justify-end flex mr-4">
19-
<div className="text-xl">
20-
<Link to="/talks" className="text-black hover:text-white mr-2">
21-
Talks
22-
</Link>
4+
function Header(): JSX.Element {
5+
return (
6+
<StaticQuery
7+
query={graphql`
8+
query SiteTitleQuery {
9+
site {
10+
siteMetadata {
11+
title
12+
}
13+
}
14+
}
15+
`}
16+
render={(data) => (
17+
<nav className="flex items-center justify-between flex-wrap bg-green-800 px-6 py-12 mb-5 text-white">
18+
<div className="flex flex-no-shrink">
19+
<Link
20+
to="/"
21+
className="font-semibold text-4xl tracking-tighter hover:underline hover:animate-wiggle"
22+
>
23+
{data.site.siteMetadata.title}
24+
</Link>
25+
</div>
26+
<div className="justify-end flex mr-4">
27+
<div className="text-xl">
28+
<Link to="/talks" className="mr-6 hover:text-black">
29+
Talks
30+
</Link>
2331

24-
<Link to="/blog" className="text-black hover:text-white">
25-
Blog
26-
</Link>
27-
</div>
28-
</div>
29-
</nav>
30-
);
31-
32-
Header.defaultProps = {
33-
siteTitle: "",
34-
};
32+
<Link to="/blog" className="hover:text-black">
33+
Blog
34+
</Link>
35+
</div>
36+
</div>
37+
</nav>
38+
)}
39+
/>
40+
);
41+
}
3542

3643
export default Header;

src/components/Layout.tsx

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
1-
import { graphql, StaticQuery } from "gatsby";
21
import * as React from "react";
32

43
import Footer from "./Footer";
54
import Header from "./Header";
65

76
const Layout: React.SFC = ({ children }) => (
8-
<StaticQuery
9-
query={graphql`
10-
query SiteTitleQuery {
11-
site {
12-
siteMetadata {
13-
title
14-
}
15-
}
16-
}
17-
`}
18-
render={(data) => (
19-
<>
20-
<Header siteTitle={data.site.siteMetadata.title} />
21-
<main className="min-h-screen mx-auto px-4 py-8 max-w-2xl sm:px-6 sm:py-12 lg:max-w-3xl lg:py-16 2xl:max-w-4xl xl:px-0">
22-
{children}
23-
</main>
24-
<Footer />
25-
</>
26-
)}
27-
/>
7+
<>
8+
<Header />
9+
<main className="min-h-screen mx-auto px-4 py-8 max-w-2xl sm:px-6 sm:py-12 lg:max-w-3xl lg:py-16 2xl:max-w-4xl xl:px-0">
10+
{children}
11+
</main>
12+
<Footer />
13+
</>
2814
);
2915

3016
export default Layout;

src/components/talks/Talk.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const Talk: React.SFC<TalkProps> = ({ talk }) => {
1313
href={talk.link}
1414
target="_blank"
1515
rel="nofollow noopener noreferrer"
16-
className="border-red-300 border-solid border-b-4"
16+
className="border-solid border-b-4 hover:text-purple-400 duration-300 transition-colors"
1717
>
1818
{talk.name}
1919
</a>

src/pages/blog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class IndexPage extends React.Component<IndexPageProps, {}> {
4343
const title = node.frontmatter.title || node.fields.slug;
4444
return (
4545
<div className="post mb-10" key={node.fields.slug}>
46-
<h3 className="text-3xl">
46+
<h3 className="text-3xl hover:text-purple-400 duration-300 transition-colors">
4747
<Link to={node.fields.slug}>{title}</Link>
4848
</h3>
4949
<small className="italic text-gray-600">

src/pages/index.tsx

Lines changed: 2 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class IndexPage extends React.Component<{}, {}> {
1010
render() {
1111
return (
1212
<>
13-
<div className="object-cover min-h-screen bg-living-coral-500">
13+
<div className="object-cover min-h-screen bg-green-800">
1414
<SEO
1515
title="Home"
1616
keywords={[
@@ -32,7 +32,7 @@ class IndexPage extends React.Component<{}, {}> {
3232

3333
<Header />
3434

35-
<div className="flex flex-col justify-center text-center text-black">
35+
<div className="flex flex-col justify-center text-center text-white">
3636
<h1
3737
className="text-5xl lg:text-8xl p-10 pb-4 "
3838
style={{ fontFamily: "Chewy" }}
@@ -48,89 +48,6 @@ class IndexPage extends React.Component<{}, {}> {
4848
</div>
4949
</div>
5050

51-
<div className="flex flex-col lg:flex-row lg:justify-around bg-living-coral-500">
52-
<AboutBox
53-
customStyle={{ backgroundColor: "#FCE21A", color: "#1e3859" }}
54-
sectionTitle="Work"
55-
>
56-
<p className="my-2">
57-
I am a full-time Engineering Manger and Software Developer mostly
58-
working with open-source web technologies including
59-
<span className="text-xl ml-1" style={{ color: "#284E80" }}>
60-
TypeScript
61-
</span>
62-
,
63-
<span className="text-xl ml-1" style={{ color: "#4e2a8e" }}>
64-
Elixir
65-
</span>
66-
, and
67-
<span className="text-xl ml-1" style={{ color: "#A51601" }}>
68-
Ruby
69-
</span>
70-
.
71-
</p>
72-
<p className="my-2">
73-
In addition to working with different languages and frameworks, I
74-
like testing
75-
<HomePageLink
76-
destination="https://www.vim.org/"
77-
displayText="different"
78-
/>
79-
<HomePageLink
80-
destination="https://code.visualstudio.com/"
81-
displayText="text"
82-
/>
83-
<HomePageLink
84-
destination="http://spacemacs.org/"
85-
displayText="editors"
86-
/>
87-
.
88-
</p>
89-
<p className="my-2">
90-
You can find some of my work on
91-
<HomePageLink
92-
destination="https://github.com/tmr08c/"
93-
displayText="GitHub"
94-
/>
95-
.
96-
</p>
97-
</AboutBox>
98-
99-
<AboutBox
100-
customStyle={{ backgroundColor: "#50e1c7", color: "#1E3859" }}
101-
sectionTitle="Home"
102-
>
103-
<p className="my-2">
104-
Whether working or not, I am generally well caffeinated and use
105-
almost as many
106-
<HomePageLink
107-
destination="https://aeropress.com/"
108-
displayText="coffee"
109-
/>
110-
<HomePageLink
111-
destination="https://www.chemexcoffeemaker.com/"
112-
displayText="brewing"
113-
/>
114-
<HomePageLink
115-
destination="https://www.hario.jp/sp_v60series.html"
116-
displayText="options"
117-
/>
118-
&nbsp;as I do text editors.
119-
</p>
120-
<p className="my-2">
121-
When I'm not working, you can usually find me listening to
122-
podcasts, walking my dogs, rock climbing, or spending time my
123-
<HomePageLink
124-
destination="http://rhimerchant.com/"
125-
displayText="amazing girlfriend"
126-
/>
127-
&nbsp;who created my awesome avatar for me.
128-
</p>
129-
</AboutBox>
130-
</div>
131-
132-
<div className="bg-living-coral-500 h-32" />
133-
13451
<Footer />
13552
</>
13653
);

0 commit comments

Comments
 (0)