Skip to content

Commit 7f6fa03

Browse files
ianmstewianmstew
committed
Projects page
1 parent 7100ba9 commit 7f6fa03

18 files changed

+230
-46
lines changed

‎_includes/footer.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
<ul class="footer-social">
22
<li>
3-
<a href="https://www.linkedin.com/pub/ian-stewart/11/b04/9bb"><i class="fa fa-linkedin"></i></a>
3+
<a href="https://github.com/ianmstew"><i class="fa fa-github"></i></a>
44
</li>
55
<li>
6-
<a href="https://github.com/ianmstew"><i class="fa fa-github"></i></a>
6+
<a href="https://www.linkedin.com/pub/ian-stewart/11/b04/9bb"><i class="fa fa-linkedin"></i></a>
77
</li>
88
<li>
99
<a href="https://twitter.com/ianmstew"><i class="fa fa-twitter"></i></a>
1010
</li>
1111
<li>
1212
<a href="mailto:ianmstew at gmail dot com"><i class="fa fa-envelope-o"></i></a>
1313
</li>
14-
</ul>
15-
<div class="design-attribution">
16-
Site design shameless homage to <a href="http://markdotto.com/about/">@mdo</a>
17-
</div>
14+
</ul>

‎_includes/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<nav class="header-nav" role="navigation">
22
<a href="/" class="header-logo">@ianmstew</a>
33
<ul class="header-nav-items">
4+
<li><a href="/projects">Projects</a></li>
45
<li><a href="/presentations">Presentations</a></li>
5-
<li><a href="/fun">Fun</a></li>
66
</ul>
77
</nav>

‎_layouts/default.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
---
2+
---
3+
14
<!DOCTYPE html>
25
<html>
36
<head>
4-
<title>{{ page.title }}</title>
7+
<title>{% if page.title %}{{ page.title }} &middot; {% endif %}@ianmstew</title>
58
<link rel="stylesheet" href="/assets/css/ianmstew.css" />
69
</head>
710
<body>

‎_layouts/page.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
---
22
layout: default
3-
title: About &middot; @ianmstew
43
---
54

65
<div class="page">
7-
{% if page.page-title %}
8-
<h1 class="page-title">
9-
{{ page.page-title }}
6+
{% if page.title %}
7+
<h1 class="title">
8+
{{ page.title }}
109
</h1>
1110
{% endif %}
1211
<div class="page-body">

‎assets/css/ianmstew.css

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3007,6 +3007,19 @@ body {
30073007
a:hover {
30083008
text-decoration: none;
30093009
}
3010+
h1,
3011+
h2,
3012+
h3,
3013+
h4,
3014+
h5,
3015+
h6 {
3016+
margin-top: 1.618em;
3017+
margin-bottom: 1em;
3018+
}
3019+
h2 {
3020+
padding-bottom: 0.236em;
3021+
border-bottom: 1px solid #ddd;
3022+
}
30103023
.header {
30113024
padding-top: 1rem;
30123025
}
@@ -3095,12 +3108,6 @@ a:hover {
30953108
.footer-social li + li {
30963109
margin-left: 1.5rem;
30973110
}
3098-
.design-attribution {
3099-
margin-top: 2rem;
3100-
color: #999999;
3101-
font-size: 12px;
3102-
text-align: center;
3103-
}
31043111
.page-title {
31053112
margin-top: 0;
31063113
margin-bottom: 2rem;
@@ -3121,3 +3128,43 @@ a:hover {
31213128
margin: 3rem auto;
31223129
background-color: #eeeeee;
31233130
}
3131+
.marionette-logo__link {
3132+
border-bottom: none !important;
3133+
}
3134+
.marionette-logo__link:hover {
3135+
border-bottom: none !important;
3136+
}
3137+
.marionette-logo__primary {
3138+
height: 35px;
3139+
}
3140+
.marionette-logo__text {
3141+
height: 25px;
3142+
margin-left: -7px;
3143+
}
3144+
.inspector-logo {
3145+
margin-left: 10px;
3146+
}
3147+
.inspector-logo__primary {
3148+
height: 25px;
3149+
}
3150+
.state-logo {
3151+
height: 20px;
3152+
margin-left: 10px;
3153+
vertical-align: bottom;
3154+
}
3155+
.sesame-logo {
3156+
height: 40px;
3157+
margin-left: 10px;
3158+
vertical-align: text-bottom;
3159+
}
3160+
.squareknot-logo {
3161+
height: 30px;
3162+
}
3163+
.regulations-logo {
3164+
height: 35px;
3165+
}
3166+
.api-network-logo {
3167+
height: 25px;
3168+
margin-left: 10px;
3169+
vertical-align: text-bottom;
3170+
}

‎assets/img/api-network-logo.png

9.78 KB
Loading

‎assets/img/regulations-logo.png

92.7 KB
Loading

‎assets/img/squareknot-logo.png

13.5 KB
Loading

‎assets/img/state-logo.png

4.75 KB
Loading

‎assets/less/font.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,400,300,600);
2-
@import "fontawesome/font-awesome.less";
2+
@import "fontawesome/font-awesome.less";

‎assets/less/footer.less

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@footer-height: 100px;
2+
13
.footer {
24
&:extend(.container all);
35
.clearfix;
@@ -20,10 +22,3 @@
2022
margin-left: 1.5rem;
2123
}
2224
}
23-
24-
.design-attribution {
25-
margin-top: 2rem;
26-
color: @gray-light;
27-
font-size: 12px;
28-
text-align: center;
29-
}

‎assets/less/global.less

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,14 @@ html, body {
1414

1515
a:hover {
1616
text-decoration: none;
17-
}
17+
}
18+
19+
h1, h2, h3, h4, h5, h6 {
20+
margin-top: 1.618em;
21+
margin-bottom: 1em;
22+
}
23+
24+
h2 {
25+
padding-bottom: 0.236em; // 0.618^3
26+
border-bottom: 1px solid #ddd;
27+
}

‎assets/less/ianmstew.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
@import "body.less";
88
@import "footer.less";
99
@import "page.less";
10+
@import "projects.less";
1011
@import "paths.less";
11-
12-
@footer-height: 100px;

‎assets/less/projects.less

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
.marionette-logo {
2+
3+
&__link {
4+
border-bottom: none !important;
5+
6+
&:hover {
7+
border-bottom: none !important;
8+
}
9+
}
10+
11+
&__primary {
12+
height: 35px;
13+
}
14+
15+
&__text {
16+
height: 25px;
17+
margin-left: -7px;
18+
}
19+
}
20+
21+
.inspector-logo {
22+
margin-left: 10px;
23+
24+
&__primary {
25+
height: 25px;
26+
}
27+
28+
&__glass {
29+
}
30+
}
31+
32+
.state-logo {
33+
height: 20px;
34+
margin-left: 10px;
35+
vertical-align: bottom;
36+
}
37+
38+
.sesame-logo {
39+
height: 40px;
40+
margin-left: 10px;
41+
vertical-align: text-bottom;
42+
}
43+
44+
.squareknot-logo {
45+
height: 30px;
46+
}
47+
48+
.regulations-logo {
49+
height: 35px;
50+
}
51+
52+
.api-network-logo {
53+
height: 25px;
54+
margin-left: 10px;
55+
vertical-align: text-bottom;
56+
}

‎fun/index.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎index.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ layout: page
33
---
44

55
<p class="stand-out">
6-
Hi, I'm a front end engineer whose favorite thing is architecting modular Javascript apps.
6+
Hi, I'm a front end engineer whose favorite thing is architecting modular Javascript apps and building the tools behind them.
7+
</p>
8+
<p class="stand-out">
9+
I love <a href="projects">what I do</a>.
710
</p>
8-
9-
Check out [stuff I've shown people](/presentations), and [random awesomeness](/fun).

‎presentations/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
layout: page
3-
page-title: Presentations
3+
title: Presentations
44
---
55

66
## View and Application State in Marionette
77

8-
* <a href="https://www.youtube.com/watch?v=FCUS6RrhRtI" target="_blank">Presentation</a>
9-
* <a href="http://squareknot.github.io/state-presentation/#/" target="_blank">Slides</a>
8+
* [Presentation](https://www.youtube.com/watch?v=FCUS6RrhRtI)
9+
* [Slides](http://squareknot.github.io/state-presentation/#/)
1010

1111
## SEO-Enabling Your Marionette App
1212

13-
* <a href="https://www.youtube.com/watch?v=XDKk_jLu4z0" target="_blank">Presentation</a>
14-
* <a href="https://docs.google.com/presentation/d/1jy9SXyr6ZjbY7lOSKN8QraH96-vR7mnAo0ePvzDb8uc/pub?start=false&loop=false&delayms=3000#slide=id.p" target="_blank">Slides</a>
13+
* [Presentation](https://www.youtube.com/watch?v=XDKk_jLu4z0)
14+
* [Slides](https://docs.google.com/presentation/d/1jy9SXyr6ZjbY7lOSKN8QraH96-vR7mnAo0ePvzDb8uc/pub?start=false&loop=false&delayms=3000#slide=id.p)

‎projects/index.md

Lines changed: 86 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)