{% for item in site.data.navigation %}
- {% if item.children %}
- -
- {{ item.name }}
-
-
-
-
- {% else %}
- -
- {{ item.name }}
-
+ {% assign bits = item.path | split: '/' %}
+ {% capture size %}{{ bits | size }}{% endcapture %}
+ {% if size == '2' %}
+ {% if item.children %}
+ -
+ {{ item.name }}
+
+
+
+
+ {% else %}
+ -
+ {{ item.name }}
+
+ {% endif %}
{% endif %}
{% endfor %}
diff --git a/_includes/svg-logo.html b/_includes/svg-logo.html
new file mode 100644
index 0000000..c4b2e05
--- /dev/null
+++ b/_includes/svg-logo.html
@@ -0,0 +1,63 @@
+var odi_path = [
+ /* move to start */
+ 'M 193 64',
+
+ /* 'O' */
+ 'c -5 -12.4 -12.4 -23.8 -22.2 -33.6',
+ 'c -18.9 -18.9 -43.9 -29.3 -70.6 -29.3',
+ 'c -26.7 0 -51.8 10.4 -70.6 29.3',
+ 'c -18.9 18.9 -29.2 43.9 -29.2 70.6',
+ 'c 0 26.7 10.4 51.8 29.2 70.6',
+ 'c 18.9 18.9 43.9 29.3 70.6 29.3',
+ 'c 26.7 0 51.8 -10.4 70.6 -29.3',
+ 'c 9.7 -9.7 17.2 -21.1 22.2 -33.6',
+
+ /* bottom of 'D' */
+ 'v 61.3',
+ 'h 84.8',
+ 'c 14.7 0 28.4 -2.4 40.9 -7',
+ 'c 12.3 -4.6 23.1 -11.3 32 -19.9',
+ 'c 10 -9.6 17.4 -21.2 22.2 -34.3',
+
+ /* 'I' */
+ 'v 61',
+ 'h 93.5',
+ 'v -197',
+ 'h -93.5',
+ 'v 61.1',
+
+ /* top of 'D' */
+ 'c -4.8 -13.2 -12.2 -24.7 -22.2 -34.3',
+ 'c -9 -8.6 -19.8 -15.3 -32 -19.9',
+ 'c -12.5 -4.6 -26.2 -7 -40.9 -7',
+ 'h -84.8',
+ 'v 61.4'
+]
+
+var colour = '#fff'
+var logo = SVG('canvas')
+logo.viewbox({
+ x: 0,
+ y: 0,
+ width: 467,
+ height: 202
+})
+
+var badge = logo.path(odi_path.join(' ')).fill(colour)
+
+logo.viewbox({
+ x: 0,
+ y: 0,
+ width: 990,
+ height: 200
+})
+
+word = 'labs'
+
+var text = logo.text(word).move(512, -147).fill(colour)
+text.font({
+ family: 'Helvetica Neue',
+ size: 265,
+ anchor: 'left',
+ weight: 200
+})
diff --git a/_layouts/collaborate.html b/_layouts/collaborate.html
new file mode 100644
index 0000000..9086932
--- /dev/null
+++ b/_layouts/collaborate.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{{content}}
diff --git a/assets/images/bubbles-outside.svg b/assets/images/bubbles-outside.svg
new file mode 100644
index 0000000..bc246eb
--- /dev/null
+++ b/assets/images/bubbles-outside.svg
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff --git a/collaborate.md b/collaborate.md
index fba0212..dd7db54 100644
--- a/collaborate.md
+++ b/collaborate.md
@@ -4,33 +4,4 @@ title: Collaborate with ODI Labs
We love working with people!
-
+{% include griddlify.html panels = '/collaborate/fellowships /collaborate/code /collaborate/research' %}
diff --git a/tools.md b/tools.md
index 29eff57..621b63d 100644
--- a/tools.md
+++ b/tools.md
@@ -1,4 +1,5 @@
---
+title: Tools
---
+ 
diff --git a/_collaborate/fellowships.md b/_collaborate/fellowships.md
new file mode 100644
index 0000000..e6e0cbf
--- /dev/null
+++ b/_collaborate/fellowships.md
@@ -0,0 +1,4 @@
+---
+title: Fellowships
+---
+
diff --git a/_collaborate/research.md b/_collaborate/research.md
new file mode 100644
index 0000000..6bd4a90
--- /dev/null
+++ b/_collaborate/research.md
@@ -0,0 +1,5 @@
+---
+title: Research
+---
+
+
diff --git a/_config.yml b/_config.yml
index b6d567e..75f4e2e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,31 +3,41 @@ defaults:
layout: default
- scope:
+ path: ''
type: team
values:
layout: person
- scope:
+ path: ''
type: posts
values:
layout: blost
- scope:
+ path: ''
type: tools
values:
layout: tool
- output: true
- scope:
+ path: ''
type: projects
values:
layout: project
- scope:
+ path: ''
type: research
values:
layout: research
+ - scope:
+ path: ''
+ type: collaborate
+ values:
+ layout: collaborate
+
collections:
tools:
output: true
@@ -37,5 +47,7 @@ collections:
output: true
research:
output: true
+ collaborate:
+ output: true
permalink: pretty
diff --git a/_data/links.yml b/_data/links.yml
index 314e544..adf4f5b 100644
--- a/_data/links.yml
+++ b/_data/links.yml
@@ -1,7 +1,7 @@
-- title: Github
- url: https://github.com/theodi
- fontawesome: fa-github
-
- title: Twitter
url: https://twitter.com/odilabs
fontawesome: fa-twitter
+
+- title: Github
+ url: https://github.com/theodi
+ fontawesome: fa-github
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 56c79f7..454593f 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -43,3 +43,21 @@
- name: Blog
path: /blog
+
+- name: Become an ODI Labs Fellow
+ path: /collaborate/fellowships
+ subhead: Come and work with us for 3-6 months
+ colour: 12
+ not_our: true
+
+- name: Build on our code
+ path: /collaborate/code
+ subhead: Use our tools and libraries in your work
+ colour: 3
+ not_our: true
+
+- name: Partner with us
+ path: /collaborate/research
+ subhead: Collaborate on research projects
+ colour: 7
+ not_our: true
diff --git a/_includes/footer.html b/_includes/footer.html
index fbbb89e..6ba5860 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,9 +1,58 @@
-
+
diff --git a/_includes/header.html b/_includes/header.html
index 9f2fd94..f084c95 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -9,7 +9,7 @@
-