From ded229cc2ac7be3485b597af29e339fa540795ce Mon Sep 17 00:00:00 2001
From: Stephen Fortune <stephen.fortune@theodi.org>
Date: Thu, 11 May 2017 13:01:39 +0100
Subject: [PATCH 1/4] don't add rubymine files

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7ae1e28..4be0538 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 _site/
 .sass-cache/
 .jekyll-metadata
-
+.idea
 .DS_Store

From 0d8c708e0a2562140221649517bb821796b6b097 Mon Sep 17 00:00:00 2001
From: Stephen Fortune <stephen.fortune@theodi.org>
Date: Thu, 11 May 2017 13:02:03 +0100
Subject: [PATCH 2/4] Remove WiP pages from navbar

---
 _data/navigation.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/_data/navigation.yml b/_data/navigation.yml
index 454593f..51ff979 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -1,12 +1,12 @@
-- name: Team
-  path: /team
-  # /team/:person
+#- name: Team
+#  path: /team
+#  # /team/:person
 
-- name: Research
-  path: /research
-  subhead: Discover what we are thinking
-  colour: 11
-  # /research/:theme
+#- name: Research
+#  path: /research
+#  subhead: Discover what we are thinking
+#  colour: 11
+#  # /research/:theme
 
 - name: Vision
   alt-title: Learn what we do
@@ -20,10 +20,10 @@
   colour: 8
   # /tools/:tool
 
-- name: Projects
-  path: /projects
-  subhead: Find out about the projects that we have done
-  colour: 3
+#- name: Projects
+#  path: /projects
+#  subhead: Find out about the projects that we have done
+#  colour: 3
   # /projects/:project
 
 - name: Work with us
@@ -32,14 +32,14 @@
   subhead: Do research with us, join us as a fellow and develop with our code
   colour: 3
 
-- name: Resources
-  path: /resources
+#- name: Resources
+#  path: /resources
 
-- name: Guides
-  alt-title: Find out how to work with data
-  path: /guides
-  subhead: Learn how to publish, discover and get insight from data
-  colour: 7
+#- name: Guides
+#  alt-title: Find out how to work with data
+#  path: /guides
+#  subhead: Learn how to publish, discover and get insight from data
+#  colour: 7
 
 - name: Blog
   path: /blog

From 389af782eb0dcc452a02334104c60ece73ef45cf Mon Sep 17 00:00:00 2001
From: Stephen Fortune <stephen.fortune@theodi.org>
Date: Thu, 11 May 2017 13:09:54 +0100
Subject: [PATCH 3/4] no collaboration links as absent content

---
 _data/navigation.yml | 46 +++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/_data/navigation.yml b/_data/navigation.yml
index 51ff979..456e7d6 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -26,11 +26,7 @@
 #  colour: 3
   # /projects/:project
 
-- name: Work with us
-  not_our: true
-  path: /collaborate
-  subhead: Do research with us, join us as a fellow and develop with our code
-  colour: 3
+
 
 #- name: Resources
 #  path: /resources
@@ -44,20 +40,26 @@
 - 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
+#- name: Work with us
+#  not_our: true
+#  path: /collaborate
+#  subhead: Do research with us, join us as a fellow and develop with our code
+#  colour: 3
+
+#- 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

From d8450f3b8f023145a96ee43aa96b813b17b1f71d Mon Sep 17 00:00:00 2001
From: Stephen Fortune <stephen.fortune@theodi.org>
Date: Thu, 11 May 2017 13:14:13 +0100
Subject: [PATCH 4/4] Remove old navigation file

---
 _data/old-navigation.yml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 _data/old-navigation.yml

diff --git a/_data/old-navigation.yml b/_data/old-navigation.yml
deleted file mode 100644
index 038d9b2..0000000
--- a/_data/old-navigation.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- name: About
-  path: /about/
-  children:
-    - name: Team
-      path: /team
-    - name: Mission
-      path: /mission
-
-- name: Projects
-  path: /projects/
-
-- name: Tools
-  path: /tools/
-
-- name: Blog
-  path: /blog/