Skip to content

Commit 939b42d

Browse files
timelytreetimelytree
committed
Added homePAGE and projectsPAGE // design updates
1 parent 1b6ac2c commit 939b42d

39 files changed

+671
-89
lines changed

‎.DS_Store

4 KB
Binary file not shown.

‎_includes/demoNav.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ <h1 id="demo-title">Demo: {{ page.title }}</h1>
1919
<div id="menu">
2020
<h1 class="menu-title">Menu</h1>
2121
<ul>
22+
<li><a class="navB" href="/">Home</a></li>
2223
{% for page in site.pages %}
2324
{% if page.header %}
2425
<li data-nav="{{ page.header | downcase }}"><a class="navB" href="{{ page.url | prepend: site.baseurl }}">{{ page.header }}</a></li>
2526
{% endif %}
2627
{% endfor %}
27-
{% for category in site.categories %}
28+
<!-- {% for category in site.categories %}
2829
<li data-nav="{{ category[0] | downcase }}"><a class="navB" href="{{ site.baseurl }}/category/{{ category[0] }}">{{ category[0] }}</a></li>
29-
{% endfor %}
30+
{% endfor %} -->
3031
<li class="socialB"><a href="https://github.com/timelytree" target="_blank"><img src="{{ site.baseurl }}/images/icons/github_icon_black.svg" /></a></li>
3132
</ul>
3233
</div>

‎_includes/head.html

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<link rel="shortcut icon" href="{{ "/favicon.ico" | prepend: site.baseurl}}" type="image/x-icon" />
1313
<link href="https://fonts.googleapis.com/css?family=Cutive+Mono" rel="stylesheet">
1414

15+
16+
{% if page.id == 'homePAGE' %}<script type="text/javascript" src="{{ "/js/parallax.min.js" | prepend: site.baseurl }}"></script>{% endif %}
1517
<script type="text/javascript" src="{{ "/js/scripts.js" | prepend: site.baseurl }}"></script>
1618

1719
<script>

‎_includes/nav.html

+6-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66
<div id="menu">
77
<h1 class="menu-title">Menu</h1>
88
<ul>
9+
<li><a class="navB" href="/">Home</a></li>
910
{% for page in site.pages %}
1011
{% if page.header %}
1112
<li data-nav="{{ page.header | downcase }}"><a class="navB" href="{{ page.url | prepend: site.baseurl }}">{{ page.header }}</a></li>
1213
{% endif %}
1314
{% endfor %}
14-
{% for category in site.categories %}
15-
<li data-nav="{{ category[0] | downcase }}"><a class="navB" href="{{ site.baseurl }}/category/{{ category[0] }}">{{ category[0] }}</a></li>
16-
{% endfor %}
15+
<!-- {% for category in site.categories %}
16+
{% if category[0] != 'projects' %}
17+
<li data-nav="{{ category[0] | downcase }}"><a class="navB" href="{{ site.baseurl }}/category/{{ category[0] }}">{{ category[0] }}</a></li>
18+
{% endif %}
19+
{% endfor %} -->
1720
<li class="socialB"><a href="https://github.com/timelytree" target="_blank"><img src="{{ site.baseurl }}/images/icons/github_icon_black.svg" /></a></li>
1821
</ul>
1922
</div>

‎_includes/photography.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<div id="photography">
2+
<div>Be bold. Be proud of your work. Always move forward.</div>
3+
<div class="photo" style="background-image: url('{{site.baseurl}}/images/photography/1.jpg');"></div>
4+
<div class="photo" style="background-image: url('{{site.baseurl}}/images/photography/2.jpg');"></div>
5+
<div class="photo" style="background-image: url('{{site.baseurl}}/images/photography/3.jpg');"></div>
6+
<div class="photo" style="background-image: url('{{site.baseurl}}/images/photography/4.jpg');"></div>
7+
<div class="photo" style="background-image: url('{{site.baseurl}}/images/photography/5.jpg');"></div>
8+
<div class="photo" style="background-image: url('{{site.baseurl}}/images/photography/6.jpg');"></div>
9+
<div class="photo" style="background-image: url('{{site.baseurl}}/images/photography/7.jpg');"></div>
10+
</div>

‎_layouts/home.html

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!DOCTYPE html>
2+
<html>
3+
{% include head.html %}
4+
<body>
5+
<!-- /////////////////////////////////////////////////////////// wrapper -->
6+
<div class="wrapper" id="homePAGE">
7+
<div id="photographyB">
8+
<img src="{{ site.baseurl }}/images/logo.png" />
9+
<img src="{{ site.baseurl }}/images/logo.gif" />
10+
</div>
11+
<!-- ///////////////////////////////////////////////////////// content -->
12+
<div class="content">
13+
{{ content }}
14+
</div>
15+
{% include photography.html %}
16+
</div>
17+
</body>
18+
</html>

‎_layouts/project.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ <h1 class="post-title">{{ page.title }}</h1>
1919
</a>
2020
{% endif %}
2121
{% if page.status %}
22-
<div class="button statusB {% if page.status == 'live' %}live{% else %}inactive{% endif %}">
23-
{% if page.status == 'live' %}live{% else %}inactive{% endif %}
22+
<div class="button statusB {% if page.status == 'live' %}live{% elsif page.status == 'dev' %}dev{% else %}offline{% endif %}">
23+
{% if page.status == 'live' %}live{% elsif page.status == 'dev' %}in development{% else %}offline{% endif %}
2424
</div>
2525
{% endif %}
2626
</div>

‎_pages/about.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ That time when you walked 12 blocks only to realize you have no recollection of
99

1010
\--
1111

12-
Amongst other things, this website hosts a collection of musings created by Nauras Jabari's brain thingy. Input: stimulus; output: words, work, projects, and ideas.
12+
Amongst other things, this website hosts a collection of musings created by Nauras Jabari's brain thingy. Input: stimulus. Output: words, work, projects, and ideas.
1313

1414
\--
1515

‎_pages/blog.html

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
layout: default
3+
header: Blog
4+
permalink: /blog
5+
id: blogPAGE
6+
---
7+
8+
<ul class="post-list">
9+
{% for post in site.posts %}
10+
{% if post.categories[0] != 'projects' %}
11+
<li class="post-link">
12+
<span class="post-date">{{ post.date | date: "%b %-d, %Y" }}</span>
13+
<a class="post-title" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
14+
<ul class="categories">
15+
<li class="category-link">Categories: </li>
16+
{% for category in post.categories %}
17+
<li class="category-link"><a href="/category/{{ category | prepend: site.baseurl }}">{{ category }}</a></li>
18+
{% endfor %}
19+
</ul>
20+
</li>
21+
{% endif %}
22+
{% endfor %}
23+
</ul>

‎_pages/projects.html

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
layout: default
3+
header: Projects
4+
permalink: /projects
5+
id: projectsPAGE
6+
---
7+
8+
<ul class="project-list">
9+
{% for post in site.posts %}
10+
{% if post.categories[0] == 'projects' %}
11+
<li>
12+
<h6 class="project-title">{{ post.title }}</h6>
13+
<div class="project-info">
14+
{% if post.projectURL %}
15+
<a href="{{ post.projectURL }}" target="_blank">{{ post.projectURL }}</a>
16+
{% endif %}
17+
{% if post.status %}
18+
<div class="button statusB {% if post.status == 'live' %}live{% elsif post.status == 'dev' %}dev{% else %}offline{% endif %}">
19+
{% if post.status == 'live' %}live{% elsif post.status == 'dev' %}in development{% else %}offline{% endif %}
20+
</div>
21+
{% endif %}
22+
</div>
23+
<div class="project-tech">
24+
<h5>Technologies Used</h5>
25+
<p>{{ post.technologies }}</p>
26+
</div>
27+
<div class="project-description">
28+
{{ post.description }}
29+
</div>
30+
</li>
31+
{% endif %}
32+
{% endfor %}
33+
</ul>

‎_posts/2017-04-03-moog-media-a-conscious-media-company.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
---
22
layout: project
3-
title: "MOOG Media - A Conscious Media Company"
4-
date: 2017-04-03 11:20:00
3+
title: "MOOG Media"
4+
date: 2017-04-03 00:00
55
categories: projects
6-
projectURL: http://moogmedia.ca/
6+
projectURL: moogmedia.ca
77
github: moog-media
88
status: live
9+
technologies: "JS / Jekyll / HTML / SCSS / Gulp"
10+
description: "This website was custom-built on top of Jekyll and is used to repesent the work my sister and I are doing in the film world."
911
---
1012

1113
Outside of doing my normal computer programming thing, I actually run a film & media company with my twin sister Narina. It wasn't until I began planning the build of my company website that I realized the importance of lessons in constraint that the web development services industry is able to teach. It is important to take a large wisp of an idea and boil it down to its bare minimum functional and presentable state prior to development. I always like to use Dropbox as an example of this; at DropBox's inception, it was no more than a "put file in cloud, send file, download file" kind of application. Slowly, over the years its functionality grew to what it is now. If it had launched attempting to be all that it is now, it is likely that it would have run out of steam fairly quickly, or launched with a variety of half-baked features.

‎_posts/2017-07-31-fleetops.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
layout: project
3+
title: "FleetOps"
4+
date: 2017-07-31 00:03
5+
categories: projects
6+
# projectURL:
7+
status: dev
8+
technologies: "ReactJS / Ajax / HTML / SCSS / Gulp / AWS / Linux / Ps / Ai"
9+
description: "Single-handedly built a React front-end for a highly interactive trucking fleet management system. Contributed to the architecture development and testing of an always-on, high-traffic, AWS-driven backend that is in a constant state of receiving truck telemetrics. Integrated this backend to the React frontend and ensure smooth application operation in a production environment."
10+
---

‎_posts/2017-07-31-greenwin.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
layout: project
3+
title: "Greenwin"
4+
date: 2017-07-31 00:00
5+
categories: projects
6+
projectURL: greenwin.ca
7+
status: live
8+
technologies: "JS / HTML / SCSS / Gulp"
9+
description: "Worked with a team to design and develop a responsive front-end. Contributed to the building of various Javascript widgets and the styling of Google Maps using the Google Maps Javascript API."
10+
---

‎_posts/2017-07-31-herbal-repository.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
layout: project
3+
title: "Herbal Repository"
4+
date: 2017-07-31 00:01
5+
categories: projects
6+
projectURL: herbalrepository.ca
7+
github: herbalrepo-org
8+
status: live
9+
technologies: "Ruby on Rails / JS / HTML / SCSS / Gulp / MySQL / Linux / Ps / Ai"
10+
description: "I built this application to fullfill my passion for herbal medicines. It’s a little informationally bare at the moment but is nonetheless an excellent example of my abilities beyond just the front-end."
11+
---

‎_posts/2017-07-31-marine-conservation-society.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
layout: project
3+
title: "Marine Conservation Society"
4+
date: 2017-07-31 00:02
5+
categories: projects
6+
# projectURL:
7+
status: dev
8+
technologies: "JS / HTML / SCSS / Gulp"
9+
description: "Introduced to the project at 60% completion and during a transitional period, after which the original developer was unavailable. Picked up a large codebase and sprinted to complete the front-end of a large redesign of the website to pixel-perfection. Contributed to the building and testing of a highly interactive, custom-built and Javascript-driven informational map."
10+
---

‎_sass/_base.scss

+31-18
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ p, h1, h2, h3, h4, h5, h6, ul, li, div, a, section, header {
3636

3737
img { box-sizing: border-box; display: block; }
3838

39-
h1 { font-size: 22px; line-height: 24px; }
40-
h2 { font-size: 40px; line-height: 42px; }
41-
h3 { font-size: 34px; line-height: 36px; }
42-
h4 { font-size: 30px; line-height: 32px; }
43-
h5 { font-size: 24px; line-height: 26px; }
44-
h6 { font-size: 20px; line-height: 22px; }
45-
p, li, a, div { font-size: 16px; line-height: 18px; }
39+
h1 { font-size: 22px; line-height: 26px; }
40+
h2 { font-size: 40px; line-height: 44px; }
41+
h3 { font-size: 34px; line-height: 38px; }
42+
h4 { font-size: 30px; line-height: 34px; }
43+
h5 { font-size: 24px; line-height: 28px; }
44+
h6 { font-size: 20px; line-height: 24px; }
45+
p, li, a, div { font-size: 16px; line-height: 20px; }
4646

4747
p {
4848
margin-bottom: 10px;
@@ -51,7 +51,7 @@ p {
5151
}
5252
}
5353

54-
a {
54+
a, button {
5555
display: inline-block;
5656
cursor: pointer;
5757
text-decoration: none;
@@ -280,14 +280,27 @@ div {
280280

281281

282282

283-
//
284-
//
285-
//
286-
//
287-
//
288-
//
289-
//
290-
//
291-
//
292-
//
283+
284+
285+
286+
287+
288+
289+
290+
291+
292+
293+
294+
295+
296+
297+
298+
299+
300+
301+
302+
303+
304+
305+
293306
//

‎_sass/_custom.scss

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#homePAGE {
2+
width: 100%;
3+
height: 100%;
4+
margin: 0;
5+
margin-bottom: 0;
6+
padding-top: 0;
7+
overflow: hidden;
8+
9+
.content {
10+
width: 100%;
11+
height: 100%;
12+
}
13+
}
14+
15+
.wrapper {
16+
&.photoACTIVE {
17+
cursor: url(../images/icons/cursor_close_icon_black.svg), pointer;
18+
19+
.content {
20+
opacity: 0;
21+
}
22+
23+
#photographyB {
24+
display: none;
25+
}
26+
27+
#photography {
28+
display: block;
29+
}
30+
}
31+
}

0 commit comments

Comments
 (0)