Skip to content

Commit 747eb9e

Browse files
committed
Cleanup (#284)
* adding jekyll-feed and moving data to the right places. Also cleaining up custom layouts and includes * playing with the atom feed * removing unused files * removed unnecessary category from posts * added some lists to yaml front matter, so I had to ignore the list lint rule * cleared out references to the old name
1 parent 1b75f7e commit 747eb9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+225
-234
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ It is a work in progress for sure. Right now we are working the kicking off the
88

99
## Contribute to the Discussion
1010

11-
Join us in the [Open Source Design Gitter channel](https://gitter.im/DesignOpen/OpenSourceDesign) and make some comments in the [GitHub issues](https://github.com/DesignOpen/designopen.github.io/issues).
11+
Join us in the [The Open Design Foundation Gitter channel](https://gitter.im/DesignOpen/OpenSourceDesign) and make some comments in the [GitHub issues](https://github.com/DesignOpen/designopen.github.io/issues).
1212

1313
We do have a [Slack Team](http://osd.slack.com), but is not going to be useful/interesting to everyone; it is where we do some initial thinking around ideas before the discussion gets serious. As soon as it does we move it to [GitHub issues](https://github.com/DesignOpen/designopen.github.io/issues) which is a better place for meaningful discussion.
1414

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ end
228228
# rake lint
229229
desc "Markdown Lint"
230230
task :markdown_lint do
231-
sh "bundle exec mdl ./ -r ~MD002,~MD013,~MD026,~MD028,~MD029,~MD033,~MD034"
231+
sh "bundle exec mdl ./ -r ~MD002,~MD013,~MD026,~MD028,~MD029,~MD032,~MD033,~MD034"
232232
end
233233

234234
desc "All lints"

_config.yml

Lines changed: 17 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
1+
name: Open Design Foundation
2+
description: We think the best way to improve the design industry is to work in the open.
3+
url: http://opendesign.foundation
14
permalink: /:categories/:title/
25
highlighter: rouge
3-
url: http://opendesign.foundation
4-
name: Open Source Design
56
excerpt_separator: <!--more-->
67
markdown: kramdown
78
gems:
89
- jekyll-sitemap
9-
exclude: [vendor]
10+
- jekyll-feed
11+
exclude:
12+
- vendor
13+
- Gemfile
14+
- Gemfile.lock
15+
- Guardfile
16+
- Rakefile
17+
- README.md
18+
- CONTRIBUTING.md
19+
- LICENSE
20+
- CNAME
1021
sass:
1122
sass_dir: _sass
1223
style: compressed
@@ -16,77 +27,13 @@ compress_html:
1627
endings: all
1728
comments: ["<!--", "-->"]
1829
post:
19-
template: _post.txt
30+
template: _templates/post.txt
2031
extension: md
2132
resource:
22-
template: _resource.txt
33+
template: _templates/resource.txt
2334
extension: md
2435
page:
25-
template: _page.txt
36+
template: _templates/page.txt
2637
extension: md
27-
authors:
28-
una:
29-
display_name: Una Kravets
30-
gravatar: 732b3562b0496389b40e548918c38f98
31-
email: una.kravets@gmail.com
32-
web: http://unakravets.com/
33-
twitter: una
34-
github: una
35-
bio: 'UI engineer <a href="http://do.co/welcome">DigitalOcean</a>. Community builder, technical writer, & cohost of <a href="http://toolsday.io">Toolsday</a>.'
36-
garthdb:
37-
display_name: Garth Braithwaite
38-
gravatar: b5cf6e112eeee572d722743dea924487
39-
email: garthdb@gmail.com
40-
web: http://www.garthdb.com/
41-
twitter: garthdb
42-
github: garthdb
43-
bio: 'Product Designer? and Front End Developer on <a href="http://phonegap.com">PhoneGap</a> at <a href="http://adobe.com">Adobe</a>. <a href="http://opendesign.foundation">The Open Design Foundation</a> Founder.'
44-
ttimsmith:
45-
display_name: Tim Smith
46-
gravatar: febbffcb54abe1be1435720fc2268237
47-
email: smith@ttimsmith.com
48-
web: http://theboldreport.net
49-
twitter: ttimsmith
50-
github: ttimsmith
51-
bio: 'Designer who codes, blabber mouth, and coffee addict.'
52-
areus:
53-
display_name: Areus Wade
54-
gravatar: 3a88629dd9417c822b68af4af685b782
55-
email: hi@areuswade.com
56-
web: http://areuswade.com
57-
twitter: areus
58-
github: areus
59-
bio: 'Designer in San Diego building <a href="http://areus.co/pctg">precomposed stuff</a>.'
60-
terracomma:
61-
display_name: Christopher Moody
62-
gravatar: 80d7c270dfac1d947d2b3fd39bf70b6a
63-
email: terracomma@gmail.com
64-
web: http://moody.coffee/
65-
twitter: terracomma
66-
github: terracomma
67-
bio: 'Designer & Developer. Product designer at IBM. Core Contributor <a href="http://opendesign.foundation/">The Open Design Foundation</a>. Licensed Intoxicologist.'
68-
vitorio:
69-
display_name: Vitorio Miliano
70-
gravatar: 1b2ea3fc983558c15216a609af35f709
71-
email: email_re_designers_opensource@vitor.io
72-
web: http://vitor.io
73-
twitter: vitor_io
74-
github: vitorio
75-
bio: 'User experience and interaction designer. I like talking about genuine outbreaks of the future.'
76-
mrondina:
77-
display_name: Mark Rondina
78-
gravatar: 48f5bbc2752b434e2b6d0ec263da193e
79-
email: mark@rondina.net
80-
web: http://www.markrondina.com/
81-
twitter: mrondina
82-
github: mrondina
83-
bio: 'Interactive designer working in web, games and mobile development.'
84-
jonlau:
85-
display_name: Jonathan Lau
86-
gravatar: 0bed1d08d62923272cb9786f375edcc8
87-
email: jon@jon.sg
88-
web: http://jon.sg
89-
github: lauweijie
90-
bio: 'Front-end developer.'
9138

9239
resourceCategories: ["philosophy", "sources", "redesigns", "inspiration", "tutorials", "showcase"]

_data/authors.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
garthdb:
2+
display_name: Garth Braithwaite
3+
gravatar: b5cf6e112eeee572d722743dea924487
4+
picture: http://gravatar.com/avatar/b5cf6e112eeee572d722743dea924487?s=200
5+
email: garthdb@gmail.com
6+
web: http://www.garthdb.com/
7+
twitter: garthdb
8+
github: garthdb
9+
bio: 'Product Designer? and Front End Developer on <a href="http://phonegap.com">PhoneGap</a> at <a href="http://adobe.com">Adobe</a>. <a href="http://opendesign.foundation">The Open Design Foundation</a> Founder.'
10+
una:
11+
display_name: Una Kravets
12+
gravatar: 732b3562b0496389b40e548918c38f98
13+
picture: http://gravatar.com/avatar/b5cf6e112eeee572d722743dea924487?s=200
14+
email: una.kravets@gmail.com
15+
web: http://unakravets.com/
16+
twitter: una
17+
github: una
18+
bio: 'UI engineer <a href="http://do.co/welcome">DigitalOcean</a>. Community builder, technical writer, & cohost of <a href="http://toolsday.io">Toolsday</a>.'
19+
ttimsmith:
20+
display_name: Tim Smith
21+
gravatar: febbffcb54abe1be1435720fc2268237
22+
picture: http://gravatar.com/avatar/febbffcb54abe1be1435720fc2268237?s=200
23+
email: smith@ttimsmith.com
24+
web: http://theboldreport.net
25+
twitter: ttimsmith
26+
github: ttimsmith
27+
bio: 'Designer who codes, blabber mouth, and coffee addict.'
28+
areus:
29+
display_name: Areus Wade
30+
gravatar: 3a88629dd9417c822b68af4af685b782
31+
picture: http://gravatar.com/avatar/3a88629dd9417c822b68af4af685b782?s=200
32+
email: hi@areuswade.com
33+
web: http://areuswade.com
34+
twitter: areus
35+
github: areus
36+
bio: 'Designer in San Diego building <a href="http://areus.co/pctg">precomposed stuff</a>.'
37+
terracomma:
38+
display_name: Christopher Moody
39+
gravatar: 80d7c270dfac1d947d2b3fd39bf70b6a
40+
picture: http://gravatar.com/avatar/80d7c270dfac1d947d2b3fd39bf70b6a?s=200
41+
email: terracomma@gmail.com
42+
web: http://moody.coffee/
43+
twitter: terracomma
44+
github: terracomma
45+
bio: 'Designer & Developer. Product designer at IBM. Core Contributor <a href="http://opendesign.foundation/">The Open Design Foundation</a>. Licensed Intoxicologist.'
46+
vitorio:
47+
display_name: Vitorio Miliano
48+
gravatar: 1b2ea3fc983558c15216a609af35f709
49+
picture: http://gravatar.com/avatar/1b2ea3fc983558c15216a609af35f709?s=200
50+
email: email_re_designers_opensource@vitor.io
51+
web: http://vitor.io
52+
twitter: vitor_io
53+
github: vitorio
54+
bio: 'User experience and interaction designer. I like talking about genuine outbreaks of the future.'
55+
mrondina:
56+
display_name: Mark Rondina
57+
gravatar: 48f5bbc2752b434e2b6d0ec263da193e
58+
picture: http://gravatar.com/avatar/48f5bbc2752b434e2b6d0ec263da193e?s=200
59+
email: mark@rondina.net
60+
web: http://www.markrondina.com/
61+
twitter: mrondina
62+
github: mrondina
63+
bio: 'Interactive designer working in web, games and mobile development.'
64+
jonlau:
65+
display_name: Jonathan Lau
66+
gravatar: 0bed1d08d62923272cb9786f375edcc8
67+
picture: http://gravatar.com/avatar/0bed1d08d62923272cb9786f375edcc8?s=200
68+
email: jon@jon.sg
69+
web: http://jon.sg
70+
github: lauweijie
71+
bio: 'Front-end developer.'

_drafts/moodboard-for-this-site.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
title: "Moodboard for This Site"
33
layout: post
4-
category: articles
54
tags:
6-
---
5+
---

_drafts/open-source-design-for-developers.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
title: "Open Source Design for Developers"
33
layout: post
4-
category: articles
54
tags:
65
---
76
In addition to pushing designers toward open collaboration, I've also begun speaking at open source development conferences with 2 goals in mind:

_includes/author.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{% assign author = site.data.authors[page.author] %}
2+
<div class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
3+
<div clas="avatar">
4+
<a href="{{author.web}}">
5+
{% if avatar.width and avatar.height %}
6+
<img itemprop="image" class= src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="{{ avatar.width }}" height="{{ avatar.height }}">
7+
{% else %}
8+
<img itemprop="image" class= src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="30" height="30">
9+
{% endif %}
10+
</a>
11+
</div>
12+
<h3>About the author: <a href="{{author.web}}" itemprop="url"><span itemprop="name">{{author.display_name}}</span></a></h3>
13+
<p class="author_bio">{{author.bio}}</p>
14+
</div>

_includes/global-header.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<div id="globalheadplaceholder" class="globalheadplaceholder"></div>
2+
<div id="globalhead" class="globalhead">
3+
<a href="/">
4+
{% include logo.svg %}
5+
</a>
6+
</div>

_includes/header.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import 'header';
File renamed without changes.

_includes/post-footer.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<footer class="article-footer">
2+
{% include author.html %}
3+
{% include post-footer-nav.html %}
4+
{% include comments.html %}
5+
</footer>

_layouts/default.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
layout: compress
33
---
44
{% include head.html %}
5-
<div id="globalheadplaceholder" class="globalheadplaceholder"></div>
6-
<div id="globalhead" class="globalhead">
7-
<a href="/">
8-
{% include logo.svg %}
9-
</a>
10-
</div>
5+
{% include global-header.html %}
116
{{ content }}
127
{% include global-footer.html %}
138
{% include foot.html %}

_layouts/facebook-academy.html

Lines changed: 19 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta charset="utf-8">
88
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
99
<meta name="viewport" content="width=device-width, initial-scale=1">
10-
<title>Open Source Design{% if page.title %} | {{ page.title }}{% endif %}</title>
10+
<title>{% if page.title %}{{ page.title }} | {% endif %}The Open Design Foundation</title>
1111
<link rel="shortcut icon" href="/favicon.ico">
1212
<style>
1313
.guys{
@@ -37,37 +37,24 @@
3737
<![endif]-->
3838
</head>
3939
<body itemscope itemtype="http://schema.org/WebPage">
40-
{% include head.html %}
41-
<div id="globalheadplaceholder"></div>
42-
<div id="globalhead">
43-
<a href="/">
44-
{% include logo.svg %}
45-
</a>
46-
</div>
47-
<div id="content">
48-
<article itemscope itemtype="http://schema.org/BlogPosting" class="post">
49-
<meta itemprop="description" content="{{ page.excerpt | strip_html}}">
50-
{% assign author = site.authors[page.author] %}
51-
<div id="banner"><img src="/img/fboa_banner_v2.png" width="100%" height="auto" alt="Facebook Open Academy"/></div>
52-
<header class="article-header">
53-
<h1 itemprop="name">{{ page.title }}</h1>
54-
<p>Published on <time itemprop="datePublished" datetime="{{page.date | date: "%Y-%m-%d" }}">{{page.date | date: "%b %e, %Y" }}</time></p>
55-
</header>
56-
<section itemprop="articleBody" class="article-body">
57-
{{ content }}
58-
</section>
59-
<footer class="article-footer">
60-
<div class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
61-
<a href="{{author.web}}"><img itemprop="image" src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="30" height="30"></a>
62-
<h3>About the author: <a href="{{site.authors[page.author].web}}" itemprop="url"><span itemprop="name">{{author.display_name}}</span></a></h3>
63-
<p class="author_bio">{{author.bio}}</p>
64-
</div>
65-
{% include post_footer.html %}
66-
{% include comments.html %}
67-
</footer>
68-
<meta itemprop="url" content="{{ site.url }}{{ page.url }}">
69-
</article>
70-
</div>
40+
{% include head.html %}
41+
{% include global-header.html %}
42+
<div id="content">
43+
<article itemscope itemtype="http://schema.org/BlogPosting" class="post">
44+
<meta itemprop="description" content="{{ page.excerpt | strip_html}}">
45+
{% assign author = site.data.authors[page.author] %}
46+
<div id="banner"><img src="/img/fboa_banner_v2.png" width="100%" height="auto" alt="Facebook Open Academy"/></div>
47+
<header class="article-header">
48+
<h1 itemprop="name">{{ page.title }}</h1>
49+
<p>Published on <time itemprop="datePublished" datetime="{{page.date | date: "%Y-%m-%d" }}">{{page.date | date: "%b %e, %Y" }}</time></p>
50+
</header>
51+
<section itemprop="articleBody" class="article-body">
52+
{{ content }}
53+
</section>
54+
{% include post-footer.html %}
55+
<meta itemprop="url" content="{{ site.url }}{{ page.url }}">
56+
</article>
57+
</div>
7158
</body>
7259
{% include analytics.html %}
7360
</html>

0 commit comments

Comments
 (0)