Skip to content

Cleanup #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ It is a work in progress for sure. Right now we are working the kicking off the

## Contribute to the Discussion

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).
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).

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.

Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ end
# rake lint
desc "Markdown Lint"
task :markdown_lint do
sh "bundle exec mdl ./ -r ~MD002,~MD013,~MD026,~MD028,~MD029,~MD033,~MD034"
sh "bundle exec mdl ./ -r ~MD002,~MD013,~MD026,~MD028,~MD029,~MD032,~MD033,~MD034"
end

desc "All lints"
Expand Down
87 changes: 17 additions & 70 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
name: Open Design Foundation
description: We think the best way to improve the design industry is to work in the open.
url: http://opendesign.foundation
permalink: /:categories/:title/
highlighter: rouge
url: http://opendesign.foundation
name: Open Source Design
excerpt_separator: <!--more-->
markdown: kramdown
gems:
- jekyll-sitemap
exclude: [vendor]
- jekyll-feed
exclude:
- vendor
- Gemfile
- Gemfile.lock
- Guardfile
- Rakefile
- README.md
- CONTRIBUTING.md
- LICENSE
- CNAME
sass:
sass_dir: _sass
style: compressed
Expand All @@ -16,77 +27,13 @@ compress_html:
endings: all
comments: ["<!--", "-->"]
post:
template: _post.txt
template: _templates/post.txt
extension: md
resource:
template: _resource.txt
template: _templates/resource.txt
extension: md
page:
template: _page.txt
template: _templates/page.txt
extension: md
authors:
una:
display_name: Una Kravets
gravatar: 732b3562b0496389b40e548918c38f98
email: [email protected]
web: http://unakravets.com/
twitter: una
github: una
bio: 'UI engineer <a href="http://do.co/welcome">DigitalOcean</a>. Community builder, technical writer, & cohost of <a href="http://toolsday.io">Toolsday</a>.'
garthdb:
display_name: Garth Braithwaite
gravatar: b5cf6e112eeee572d722743dea924487
email: [email protected]
web: http://www.garthdb.com/
twitter: garthdb
github: garthdb
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.'
ttimsmith:
display_name: Tim Smith
gravatar: febbffcb54abe1be1435720fc2268237
email: [email protected]
web: http://theboldreport.net
twitter: ttimsmith
github: ttimsmith
bio: 'Designer who codes, blabber mouth, and coffee addict.'
areus:
display_name: Areus Wade
gravatar: 3a88629dd9417c822b68af4af685b782
email: [email protected]
web: http://areuswade.com
twitter: areus
github: areus
bio: 'Designer in San Diego building <a href="http://areus.co/pctg">precomposed stuff</a>.'
terracomma:
display_name: Christopher Moody
gravatar: 80d7c270dfac1d947d2b3fd39bf70b6a
email: [email protected]
web: http://moody.coffee/
twitter: terracomma
github: terracomma
bio: 'Designer & Developer. Product designer at IBM. Core Contributor <a href="http://opendesign.foundation/">The Open Design Foundation</a>. Licensed Intoxicologist.'
vitorio:
display_name: Vitorio Miliano
gravatar: 1b2ea3fc983558c15216a609af35f709
email: [email protected]
web: http://vitor.io
twitter: vitor_io
github: vitorio
bio: 'User experience and interaction designer. I like talking about genuine outbreaks of the future.'
mrondina:
display_name: Mark Rondina
gravatar: 48f5bbc2752b434e2b6d0ec263da193e
email: [email protected]
web: http://www.markrondina.com/
twitter: mrondina
github: mrondina
bio: 'Interactive designer working in web, games and mobile development.'
jonlau:
display_name: Jonathan Lau
gravatar: 0bed1d08d62923272cb9786f375edcc8
email: [email protected]
web: http://jon.sg
github: lauweijie
bio: 'Front-end developer.'

resourceCategories: ["philosophy", "sources", "redesigns", "inspiration", "tutorials", "showcase"]
71 changes: 71 additions & 0 deletions _data/authors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
garthdb:
display_name: Garth Braithwaite
gravatar: b5cf6e112eeee572d722743dea924487
picture: http://gravatar.com/avatar/b5cf6e112eeee572d722743dea924487?s=200
email: [email protected]
web: http://www.garthdb.com/
twitter: garthdb
github: garthdb
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.'
una:
display_name: Una Kravets
gravatar: 732b3562b0496389b40e548918c38f98
picture: http://gravatar.com/avatar/b5cf6e112eeee572d722743dea924487?s=200
email: [email protected]
web: http://unakravets.com/
twitter: una
github: una
bio: 'UI engineer <a href="http://do.co/welcome">DigitalOcean</a>. Community builder, technical writer, & cohost of <a href="http://toolsday.io">Toolsday</a>.'
ttimsmith:
display_name: Tim Smith
gravatar: febbffcb54abe1be1435720fc2268237
picture: http://gravatar.com/avatar/febbffcb54abe1be1435720fc2268237?s=200
email: [email protected]
web: http://theboldreport.net
twitter: ttimsmith
github: ttimsmith
bio: 'Designer who codes, blabber mouth, and coffee addict.'
areus:
display_name: Areus Wade
gravatar: 3a88629dd9417c822b68af4af685b782
picture: http://gravatar.com/avatar/3a88629dd9417c822b68af4af685b782?s=200
email: [email protected]
web: http://areuswade.com
twitter: areus
github: areus
bio: 'Designer in San Diego building <a href="http://areus.co/pctg">precomposed stuff</a>.'
terracomma:
display_name: Christopher Moody
gravatar: 80d7c270dfac1d947d2b3fd39bf70b6a
picture: http://gravatar.com/avatar/80d7c270dfac1d947d2b3fd39bf70b6a?s=200
email: [email protected]
web: http://moody.coffee/
twitter: terracomma
github: terracomma
bio: 'Designer & Developer. Product designer at IBM. Core Contributor <a href="http://opendesign.foundation/">The Open Design Foundation</a>. Licensed Intoxicologist.'
vitorio:
display_name: Vitorio Miliano
gravatar: 1b2ea3fc983558c15216a609af35f709
picture: http://gravatar.com/avatar/1b2ea3fc983558c15216a609af35f709?s=200
email: [email protected]
web: http://vitor.io
twitter: vitor_io
github: vitorio
bio: 'User experience and interaction designer. I like talking about genuine outbreaks of the future.'
mrondina:
display_name: Mark Rondina
gravatar: 48f5bbc2752b434e2b6d0ec263da193e
picture: http://gravatar.com/avatar/48f5bbc2752b434e2b6d0ec263da193e?s=200
email: [email protected]
web: http://www.markrondina.com/
twitter: mrondina
github: mrondina
bio: 'Interactive designer working in web, games and mobile development.'
jonlau:
display_name: Jonathan Lau
gravatar: 0bed1d08d62923272cb9786f375edcc8
picture: http://gravatar.com/avatar/0bed1d08d62923272cb9786f375edcc8?s=200
email: [email protected]
web: http://jon.sg
github: lauweijie
bio: 'Front-end developer.'
3 changes: 1 addition & 2 deletions _drafts/moodboard-for-this-site.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
title: "Moodboard for This Site"
layout: post
category: articles
tags:
---
---
1 change: 0 additions & 1 deletion _drafts/open-source-design-for-developers.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
title: "Open Source Design for Developers"
layout: post
category: articles
tags:
---
In addition to pushing designers toward open collaboration, I've also begun speaking at open source development conferences with 2 goals in mind:
Expand Down
14 changes: 14 additions & 0 deletions _includes/author.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% assign author = site.data.authors[page.author] %}
<div class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
<div clas="avatar">
<a href="{{author.web}}">
{% if avatar.width and avatar.height %}
<img itemprop="image" class= src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="{{ avatar.width }}" height="{{ avatar.height }}">
{% else %}
<img itemprop="image" class= src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="30" height="30">
{% endif %}
</a>
</div>
<h3>About the author: <a href="{{author.web}}" itemprop="url"><span itemprop="name">{{author.display_name}}</span></a></h3>
<p class="author_bio">{{author.bio}}</p>
</div>
6 changes: 6 additions & 0 deletions _includes/global-header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div id="globalheadplaceholder" class="globalheadplaceholder"></div>
<div id="globalhead" class="globalhead">
<a href="/">
{% include logo.svg %}
</a>
</div>
1 change: 1 addition & 0 deletions _includes/header.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'header';
File renamed without changes.
5 changes: 5 additions & 0 deletions _includes/post-footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<footer class="article-footer">
{% include author.html %}
{% include post-footer-nav.html %}
{% include comments.html %}
</footer>
7 changes: 1 addition & 6 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
layout: compress
---
{% include head.html %}
<div id="globalheadplaceholder" class="globalheadplaceholder"></div>
<div id="globalhead" class="globalhead">
<a href="/">
{% include logo.svg %}
</a>
</div>
{% include global-header.html %}
{{ content }}
{% include global-footer.html %}
{% include foot.html %}
51 changes: 19 additions & 32 deletions _layouts/facebook-academy.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Open Source Design{% if page.title %} | {{ page.title }}{% endif %}</title>
<title>{% if page.title %}{{ page.title }} | {% endif %}The Open Design Foundation</title>
<link rel="shortcut icon" href="/favicon.ico">
<style>
.guys{
Expand Down Expand Up @@ -37,37 +37,24 @@
<![endif]-->
</head>
<body itemscope itemtype="http://schema.org/WebPage">
{% include head.html %}
<div id="globalheadplaceholder"></div>
<div id="globalhead">
<a href="/">
{% include logo.svg %}
</a>
</div>
<div id="content">
<article itemscope itemtype="http://schema.org/BlogPosting" class="post">
<meta itemprop="description" content="{{ page.excerpt | strip_html}}">
{% assign author = site.authors[page.author] %}
<div id="banner"><img src="/img/fboa_banner_v2.png" width="100%" height="auto" alt="Facebook Open Academy"/></div>
<header class="article-header">
<h1 itemprop="name">{{ page.title }}</h1>
<p>Published on <time itemprop="datePublished" datetime="{{page.date | date: "%Y-%m-%d" }}">{{page.date | date: "%b %e, %Y" }}</time></p>
</header>
<section itemprop="articleBody" class="article-body">
{{ content }}
</section>
<footer class="article-footer">
<div class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
<a href="{{author.web}}"><img itemprop="image" src="http://www.gravatar.com/avatar/{{author.gravatar}}" alt="{{author.display_name}}" width="30" height="30"></a>
<h3>About the author: <a href="{{site.authors[page.author].web}}" itemprop="url"><span itemprop="name">{{author.display_name}}</span></a></h3>
<p class="author_bio">{{author.bio}}</p>
</div>
{% include post_footer.html %}
{% include comments.html %}
</footer>
<meta itemprop="url" content="{{ site.url }}{{ page.url }}">
</article>
</div>
{% include head.html %}
{% include global-header.html %}
<div id="content">
<article itemscope itemtype="http://schema.org/BlogPosting" class="post">
<meta itemprop="description" content="{{ page.excerpt | strip_html}}">
{% assign author = site.data.authors[page.author] %}
<div id="banner"><img src="/img/fboa_banner_v2.png" width="100%" height="auto" alt="Facebook Open Academy"/></div>
<header class="article-header">
<h1 itemprop="name">{{ page.title }}</h1>
<p>Published on <time itemprop="datePublished" datetime="{{page.date | date: "%Y-%m-%d" }}">{{page.date | date: "%b %e, %Y" }}</time></p>
</header>
<section itemprop="articleBody" class="article-body">
{{ content }}
</section>
{% include post-footer.html %}
<meta itemprop="url" content="{{ site.url }}{{ page.url }}">
</article>
</div>
</body>
{% include analytics.html %}
</html>
Loading