Skip to content

Commit a87b926

Browse files
joshuajharrisjoshuajharris
committed
updates.
1 parent add3053 commit a87b926

19 files changed

+322
-98
lines changed

Diff for: ‎_config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ stackoverflow_username: joshuajharris
3636
disqus:
3737
shortname: joshuajharris
3838

39+
collections:
40+
projects:
41+
output: true
42+
permalink: /:collection/:name
43+
3944
# Build settings
4045
markdown: kramdown
4146
theme: minima

Diff for: ‎_includes/head.html

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<meta name="description" content="{{ page.excerpt | default: site.description | strip_html | normalize_whitespace | truncate: 160 | escape }}">
88

99
<link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
10+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
1011
<link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
1112
<link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | relative_url }}">
1213

Diff for: ‎_includes/header.html

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<header class="site-header" role="banner">
2-
32
<div class="wrapper">
43
{% assign default_paths = site.pages | map: "path" %}
54
{% assign page_paths = site.header_pages | default: default_paths %}

Diff for: ‎_includes/nav.html

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<ul class="nav-list">
2+
<a class="nav-link" href="/posts">
3+
<li>
4+
<h2>
5+
<i class="fa fa-pencil"></i> POSTS
6+
</h2>
7+
</li>
8+
</a>
9+
<a class="nav-link" href="/projects">
10+
<li>
11+
<h2>
12+
<i class="fa fa-file-code-o"></i> PROJECTS
13+
</h2>
14+
</li>
15+
</a>
16+
<a class="nav-link" href="/about">
17+
<li>
18+
<h2>
19+
<i class="fa fa-user"></i> ABOUT
20+
</h2>
21+
</li>
22+
</a>
23+
</ul>
24+

Diff for: ‎_includes/social.html

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<div class="page-social-links page-padded">
2+
3+
<a href="{{ site.github_username }}" target="_blank">
4+
<i class="fa fa-github-alt"></i>
5+
</a>
6+
7+
<a href="{{ site.behance_username }}" target="_blank">
8+
<i class="fa fa-behance-square"></i>
9+
</a>
10+
11+
<a href="{{ site.linkedin_username }}" target="_blank">
12+
<i class="fa fa-linkedin-square"></i>
13+
</a>
14+
15+
<a href="{{ site.twitter_username }}" target="_blank">
16+
<i class="fa fa-twitter"></i>
17+
</a>
18+
19+
<a href="{{ site.medium_username}}" target="_blank">
20+
<i class="fa fa-medium"></i>
21+
</a>
22+
23+
<a href="{{ site.instagram_username}}" target="_blank">
24+
<i class="fa fa-instagram"></i>
25+
</a>
26+
27+
<a href="{{ site.dribbble_username}}" target="_blank">
28+
<i class="fa fa-dribbble"></i>
29+
</a>
30+
31+
<a href="{{ site.stackoverflow_username}}" target="_blank">
32+
<i class="fa fa-stack-overflow"></i>
33+
</a>
34+
35+
<a href="{{ site.angelslist_username }}" target="_blank">
36+
<i class="fa fa-angellist"></i>
37+
</a>
38+
39+
</div>

Diff for: ‎_layouts/default.html

+7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
<main class="page-content" aria-label="Content">
1111
<div class="wrapper">
1212
{{ content }}
13+
14+
<hr />
15+
16+
{% include nav.html %}
17+
18+
{% include social.html %}
19+
1320
</div>
1421
</main>
1522

Diff for: ‎_layouts/home.html

+42-18
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,58 @@
22
layout: default
33
---
44

5-
<img class="page-title-image" src="{{ "assets/images/vector-profile.png" | relative_url }}"/>
6-
<div class="page-subtitle">DEVELOPER // DESIGNER</div>
7-
85
<div class="home">
9-
<h1 class="page-heading page-padded">JOSHUA J. HARRIS</h1>
10-
6+
<img class="page-title-image" src="{{ "assets/images/vector-profile.png" | relative_url }}"/>
7+
<div class="page-subtitle">DEVELOPER // DESIGNER</div>
118
<div class="page-padded">
9+
<h1 class="page-heading">JOSHUA J. HARRIS</h1>
10+
1211
<p class="page-description">
1312
I love creating great user experiences. Check out some of my work below.
1413
</p>
15-
16-
<a class="page-button-contrast" href="#">FOLLOW</a>
17-
<a class="page-button" href="#">RESUME</a>
18-
19-
<hr />
14+
15+
<a class="page-button-contrast" href="https://twitter.com/{{ site.twitter_username }}" target="_blank">
16+
<i class="fa fa-twitter"></i> FOLLOW
17+
</a>
18+
<a class="page-button" href="https://resume.joshuajharris.com" target="_blank">
19+
<i class="fa fa-file-text-o"></i> RESUME
20+
</a>
2021
</div>
2122

22-
<h2 class="page-section-heading page-padded">FEATURED POSTS</h2>
23+
<hr />
24+
25+
<h2 class="page-section-heading"><i class="fa fa-pencil"></i> FEATURED POSTS</h2>
2326

2427
<ul class="post-list">
2528
{% for post in site.posts %}
26-
<li>
27-
<h2>
28-
<a class="post-link" href="{{ post.url | relative_url }}">{{ post.title | escape }}</a>
29-
</h2>
30-
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
31-
<span class="post-meta">{{ post.date | date: date_format }}</span>
32-
</li>
29+
<a class="post-link" href="{{ post.url | relative_url }}">
30+
<li>
31+
<h2>
32+
{{ post.title | escape }}
33+
</h2>
34+
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
35+
<span class="post-meta">{{ post.date | date: date_format }}</span>
36+
</li>
37+
</a>
38+
{% endfor %}
39+
</ul>
40+
41+
<br/>
42+
<br/>
43+
44+
<h2 class="page-section-heading"><i class="fa fa-file-code-o"></i> FEATURED PROJECTS</h2>
45+
46+
<ul class="post-list">
47+
{% for project in site.projects %}
48+
<a class="post-link" href="{{ project.url | relative_url }}">
49+
<li>
50+
<h2>
51+
{{ project.title | escape }}
52+
</h2>
53+
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
54+
<span class="post-meta">{{ project.date | date: date_format }}</span>
55+
</li>
56+
</a>
3357
{% endfor %}
3458
</ul>
3559

Diff for: ‎_layouts/page.html

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
---
22
layout: default
33
---
4-
<article class="post">
54

6-
<header class="post-header">
7-
<h1 class="post-title">{{ page.title | escape }}</h1>
8-
</header>
9-
10-
<div>
5+
<div class="page-padded">
6+
<h1 class="page-heading">{{ page.title }}</h1>
7+
8+
<p class="page-description">
119
{{ page.description }}
12-
</div>
10+
</p>
11+
</div>
1312

14-
<div class="post-content">
15-
{{ content }}
16-
</div>
13+
<hr />
1714

18-
</article>
15+
{{ content }}

Diff for: ‎_layouts/post.html

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
layout: default
33
---
4-
<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
5-
6-
<header class="post-header">
7-
<h1 class="post-title" itemprop="name headline">{{ page.title | escape }}</h1>
4+
<article itemscope itemtype="http://schema.org/BlogPosting">
5+
<header class="post-header page-padded">
6+
<h1 class="page-heading" itemprop="name headline">{{ page.title | escape }}</h1>
87
<p class="post-meta">
98
<time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
109
{% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
@@ -15,9 +14,13 @@ <h1 class="post-title" itemprop="name headline">{{ page.title | escape }}</h1>
1514
{% endif %}</p>
1615
</header>
1716

18-
<div class="post-content" itemprop="articleBody">
17+
<hr/>
18+
19+
<div class="post-content page-padded" itemprop="articleBody">
1920
{{ content }}
2021
</div>
22+
23+
<hr/>
2124

2225
{% if site.disqus.shortname %}
2326
{% include disqus_comments.html %}

Diff for: ‎_sass/main.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $grey-color-light: lighten($grey-color, 40%) !default;
3232
$grey-color-dark: darken($grey-color, 25%) !default;
3333

3434
// Width of the content area
35-
$content-width: 800px !default;
35+
$content-width: 732px !default;
3636

3737
$on-palm: 600px !default;
3838
$on-laptop: 800px !default;

Diff for: ‎_sass/partials/_base.scss

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ a {
8080

8181
&:hover {
8282
color: $text-color;
83-
text-decoration: underline;
8483
}
8584

8685
.social-media-list &:hover {

0 commit comments

Comments
 (0)