Skip to content

Commit 24a0b07

Browse files
cwebercweber
committed
portfolio reordered and case studies placeholder in
1 parent c3caf3f commit 24a0b07

17 files changed

+94
-35
lines changed

‎_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Site settings
22
title: Caitlin Weber
3-
email: caitlin.weber@gmail.com
3+
email: caitlin@caitlinweber.com
44
description: > # this means to ignore newlines until "baseurl:"
55
Welcome to the portfolio of Caitlin Weber
66
baseurl: "" # the subpath of your site, e.g. /blog/

‎_includes/menu-items.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ul>
2-
<!-- <li><a href="/casestudies">Case Studies</a></li>
3-
--> <li><a href="/process">Process</a></li>
2+
<li><a href="/casestudies">Case Studies</a></li>
3+
<li><a href="/process">Theory</a></li>
44
<li><a href="/portfolio">Visual Design</a></li>
55
<li><a href="/blog">Blog</a></li>
66
</ul>

‎_layouts/work.html

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
layout: default
3+
---
4+
<div class="content post">
5+
<article class="post-content">
6+
<header class="page-heading">
7+
<a href="{{ post.url | prepend: site.baseurl }}"><h1>{{ page.title }}</h1></a>
8+
<address>
9+
10+
</address>
11+
<div class="clear"></div>
12+
</header>
13+
14+
15+
{{ content }}
16+
<div class="clear"></div>
17+
</article>
18+
19+
</div>

‎_posts/portfolio/2016-02-06-planet-magazine.md renamed to ‎_posts/portfolio/2008-01-01-planet-magazine.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "Planet Magazine"
44
categories:
55
- portfolio

‎_posts/portfolio/2016-02-10-earth-advantage.md renamed to ‎_posts/portfolio/2010-06-01-earth-advantage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "Earth Advantage Institute"
44
categories:
55
- portfolio

‎_posts/portfolio/2016-02-11-art-around.md renamed to ‎_posts/portfolio/2011-01-01-art-around.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "ArtAround"
44
categories:
55
- portfolio

‎_posts/portfolio/2016-02-09-political-party-time.md renamed to ‎_posts/portfolio/2013-01-01-political-party-time.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "Political Party Time"
44
categories:
55
- portfolio

‎_posts/portfolio/2016-02-04-quien-manda.md renamed to ‎_posts/portfolio/2013-10-01-quien-manda.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "Quién Manda"
44
categories:
55
- portfolio

‎_posts/portfolio/2016-02-03-money-politics-and-transparency.md renamed to ‎_posts/portfolio/2014-01-01-money-politics-and-transparency.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "Money, Politics & Transparency"
44
categories:
55
- portfolio

‎_posts/portfolio/2016-02-05-sunlight-foundation.md renamed to ‎_posts/portfolio/2015-01-01-sunlight-foundation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "Sunlight Foundation"
44
categories:
55
- portfolio

‎_posts/portfolio/2016-02-08-poppleton-redevelopment.md renamed to ‎_posts/portfolio/2015-11-01-poppleton-redevelopment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "Poppleton Redevelopment"
44
categories:
55
- portfolio

‎_posts/portfolio/2016-02-07-biomimicry.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: post
2+
layout: work
33
title: "Biomimicry Visualizations"
44
categories:
55
- portfolio

‎_sass/_layout.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
.site-nav {
2626
float: right;
27-
line-height: 56px;
27+
padding-top: 18px;
2828

2929
.menu-icon {
3030
display: none;
@@ -46,6 +46,7 @@
4646
text-align: right;
4747
float: none;
4848
width: 100%;
49+
padding-top: 0;
4950

5051
.menu-icon {
5152
display: block;

‎casestudies.html

+13-18
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
---
22
layout: default
3-
title:
3+
title: Case Studies
44
permalink: /casestudies/
55
---
66

7-
<div class="content">
8-
9-
{% for post in site.categories['casestudy'] %}
7+
<div class="home content">
108
<article>
11-
<! -- Casestudy Item -->
12-
<header class="page-heading">
13-
<a href="{{ post.url | prepend: site.baseurl }}"><h1>{{ post.title }}</h1></a>
14-
<address>
15-
<p><csmall>{{ post.date | date: "%b %-d, %Y" }}</csmall></p>
16-
</address>
9+
<header class="page-heading">
10+
<h1>Case Studies</h1>
1711
<div class="clear"></div>
1812
</header>
19-
<a href="{{ post.url | prepend: site.baseurl }}">
20-
<img class="img-responsive" src="{{ "/img/" | prepend: site.baseurl }}{{ post.img }}">
21-
</a>
22-
{{ post.excerpt }}
23-
<p><a href="{{ post.url | prepend: site.baseurl }}">[Read More]</a></p>
24-
<div class="hline"></div>
2513

26-
<div class="spacing"></div>
14+
<p>Case studies of recent social design projects are on their way, but in the mean time, you can get a sneak peak of my social design work by reading some of my blog posts.</p>
15+
<h2 class="beta">Try these:</h2>
16+
<ul>
17+
<li><a href="/blog/2016/01/20/have-you-been-to-the-public-market.html">Have you been to the public market?</a></li>
18+
<li><a href="/blog/2015/10/05/in-the-event-of-an-emergency.html">In the event of an emergency</a></li>
19+
<li><a href="http://sunlightfoundation.com/blog/2014/02/03/human-centered-design-open-congress/">Human centered design: How we're rethinking Open Congress</a></li>
20+
<li><a href="http://sunlightfoundation.com/blog/2014/07/08/rethinking-opencongress-design-update/">Rethinking Open Congress: Design Update</a></li>
21+
</ul>
2722
</article>
28-
{% endfor %}
23+
2924

3025
</div>

‎casestudies.html-foo.html

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
layout: default
3+
title:
4+
---
5+
6+
<div class="content">
7+
8+
{% for post in site.categories['casestudy'] %}
9+
<article>
10+
<! -- Casestudy Item -->
11+
<header class="page-heading">
12+
<a href="{{ post.url | prepend: site.baseurl }}"><h1>{{ post.title }}</h1></a>
13+
<address>
14+
<p><csmall>{{ post.date | date: "%b %-d, %Y" }}</csmall></p>
15+
</address>
16+
<div class="clear"></div>
17+
</header>
18+
<a href="{{ post.url | prepend: site.baseurl }}">
19+
<img class="img-responsive" src="{{ "/img/" | prepend: site.baseurl }}{{ post.img }}">
20+
</a>
21+
{{ post.excerpt }}
22+
<p><a href="{{ post.url | prepend: site.baseurl }}">[Read More]</a></p>
23+
<div class="hline"></div>
24+
25+
<div class="spacing"></div>
26+
</article>
27+
{% endfor %}
28+
29+
</div>

‎css/main.scss

+17-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $grey-color-dark: darken($grey-color, 25%);
2525
// Width of the content area
2626
$content-width: 800px;
2727

28-
$on-palm: 630px;
28+
$on-palm: 660px;
2929
$on-laptop: 800px;
3030

3131

@@ -117,6 +117,8 @@ header.site-header {
117117
background-repeat: no-repeat;
118118
background-position: 0px 8px;
119119
padding-left: 35px;
120+
margin-bottom: 0;
121+
padding-top: 5px;
120122
}
121123
a:hover, .site-title a:hover {
122124
}
@@ -304,7 +306,7 @@ header.page-heading {
304306
}
305307
}
306308

307-
@media screen and (max-width: 630px) {
309+
@media screen and (max-width: 660px) {
308310
.two-col {
309311
float: none;
310312
margin-top: 3em;
@@ -328,6 +330,19 @@ header.page-heading {
328330
padding-left: 0;
329331
}
330332
}
333+
article header h1, article header address {
334+
float: none;
335+
width: 100%;
336+
text-align: left;
337+
}
338+
header.page-heading address {
339+
text-align: left;
340+
line-height: 1.1em;
341+
p {
342+
margin-bottom: 0;
343+
}
344+
}
345+
331346

332347
}
333348

‎process.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
layout: default
3-
title: Process
3+
title: Theory
44
permalink: /process/
55
---
66

77
<div class="home content">
88
<article>
99
<header class="page-heading">
10-
<h1>Process</h1>
10+
<h1>Theory</h1>
1111
<div class="clear"></div>
1212
</header>
1313

0 commit comments

Comments
 (0)