alphagov · edwardhorsford · Feb 16, 2016 · Feb 16, 2016 · Feb 16, 2016 · Feb 18, 2016
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,7 +9,8 @@ module.exports = function(grunt){
           sourcemap: true,
           includePaths: [
             'govuk_modules/govuk_template/assets/stylesheets',
-            'govuk_modules/govuk_frontend_toolkit/stylesheets'
+            'govuk_modules/govuk_frontend_toolkit/stylesheets',
+            'docs/assets/sass'
           ],
           outputStyle: 'expanded'
         },
@@ -18,9 +19,18 @@ module.exports = function(grunt){
           cwd: "app/assets/sass",
           src: ["*.scss"],
           dest: "public/stylesheets/",
-          ext: ".css"
-        }]
-      }
+          ext: ".css",
+        }],
+      },
+      // docs: {
+      //   files: [{
+      //     expand: true,
+      //     cwd: "docs/assets/sass",
+      //     src: ["*.scss"],
+      //     dest: "public/stylesheets/",
+      //     ext: ".css"
+      //   }]
+      // }
     },
 
     // Copies templates and assets from external modules and dirs

diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss
@@ -1,6 +1,7 @@
 // Import GOV.UK elements, this will import the frontend toolkit and some base styles.
 // Take a look in _govuk-elements.scss to see which files are imported.
 @import 'govuk-elements';
+@import 'documentation';
 
 // Take a look at patterns.scss to see which files are imported.
 @import 'patterns';

diff --git a/app/config.js b/app/config.js
@@ -14,7 +14,10 @@ module.exports = {
   useAuth: 'true',
 
   // Cookie warning - update link to service's cookie page.
-  cookieText: 'GOV.UK uses cookies to make the site simpler. <a href="#" title="Find out more about cookies">Find out more about cookies</a>'
+  cookieText: 'GOV.UK uses cookies to make the site simpler. <a href="#" title="Find out more about cookies">Find out more about cookies</a>',
+
+  // Enable or disable built-in docs and examples.
+  useDocs: 'true'
 
 };
 
diff --git a/app/routes.js b/app/routes.js
@@ -8,36 +8,7 @@ router.get('/', function (req, res) {
 });
 
 
-// Example routes - feel free to delete these
 
-// Passing data into a page
-
-router.get('/examples/template-data', function (req, res) {
-
-  res.render('examples/template-data', { 'name' : 'Foo' });
-
-});
-
-// Branching
-
-router.get('/examples/over-18', function (req, res) {
-
-  // get the answer from the query string (eg. ?over18=false)
-  var over18 = req.query.over18;
-
-  if (over18 == "false"){
-
-    // redirect to the relevant page
-    res.redirect("/examples/under-18");
-
-  } else {
-
-    // if over18 is any other value (or is missing) render the page requested
-    res.render('examples/over-18');
-
-  }
-
-});
 
 // add your routes here
 

diff --git a/app/views/examples/index.html b/app/views/examples/index.html
diff --git a/docs/assets/sass/documentation.scss b/docs/assets/sass/documentation.scss
@@ -0,0 +1,51 @@
+.markdown {
+	h1 {
+		@extend .heading-xlarge;
+	}
+
+	h2 {
+		@extend .heading-large;
+	}
+
+	h3 {
+		@extend .heading-medium;
+	}
+
+	h4 {
+		@extend .heading-small;
+	}
+
+	code {
+		background: $grey-4;
+		padding: 3px;
+		font-size: 1em;
+	}
+
+	pre > code {
+		@extend .code;
+		display: block;
+		@extend .panel;
+		@extend .panel-border-wide;
+		font-family: monospace;
+		margin-bottom: 15px;
+	}
+
+	img {
+		max-width: 100%;
+	}
+
+	ul {
+		@extend .list;
+		@extend .list-bullet;
+	}
+
+	blockquote {
+		@extend .panel;
+		@extend .panel-border-wide;
+	}
+
+	strong {
+		font-weight: 700;
+	}
+}
+
diff --git a/docs/creating-routes.md → docs/documentation/creating-routes.md b/docs/creating-routes.md → docs/documentation/creating-routes.md
diff --git a/docs/developer-install-instructions.md → ...install/developer-install-instructions.md b/docs/developer-install-instructions.md → ...install/developer-install-instructions.md
@@ -1,4 +1,4 @@
-# Instructions for developers
+# Advanced install guide
 
 It's built on the [Express](http://expressjs.com/) framework, and uses these GOV.UK resources:
 
@@ -8,7 +8,8 @@ It's built on the [Express](http://expressjs.com/) framework, and uses these GOV
 
 ## Requirements
 
-node.js - version 4.x.x
+* Node.js - version 4.x.x
+* command line tools (mac)
 
 ## Install dependencies
 

diff --git a/docs/install/install-the-kit.md → .../documentation/install/install-the-kit.md b/docs/install/install-the-kit.md → .../documentation/install/install-the-kit.md
@@ -90,7 +90,6 @@ The install may take up to a minute.
 ---
 [Previous page (requirements)](requirements.md)
 
-[Next page (run the kit)](run-the-kit.md)
-
 ---
-[Documentation index](../README.md)
+
+[Next page (run the kit)](run-the-kit.md)
diff --git a/docs/install/introduction.md → docs/documentation/install/introduction.md b/docs/install/introduction.md → docs/documentation/install/introduction.md
@@ -16,6 +16,3 @@ You’ll use a copy of the kit for each different prototype you want to make - t
 
 ---
 [Next page (requirements)](requirements.md)
-
----
-[Documentation index](../README.md)
diff --git a/docs/install/requirements.md → docs/documentation/install/requirements.md b/docs/install/requirements.md → docs/documentation/install/requirements.md
@@ -104,7 +104,7 @@ If you don’t have command line tools, it will open an installer. Follow the in
 ---
 [Previous page (introduction)](introduction.md)
 
+---
+
 [Next page (install the kit)](install-the-kit.md)
 
----
-[Documentation index](../README.md)
diff --git a/docs/install/run-the-kit.md → docs/documentation/install/run-the-kit.md b/docs/install/run-the-kit.md → docs/documentation/install/run-the-kit.md
@@ -38,8 +38,7 @@ In terminal press the `ctrl` and `c` keys together.
 
 The kit is now installed. Congratulations!
 
----
-[Previous page (install the kit)](install-the-kit.md)
+Next you may want to try out some of the [examples or tutorials](/docs/documentation-and-examples).
 
 ---
-[Documentation index](../README.md)
+[Previous page (install the kit)](install-the-kit.md)
diff --git a/docs/making-pages.md → docs/documentation/making-pages.md b/docs/making-pages.md → docs/documentation/making-pages.md
diff --git a/docs/documentation/multiple-heroku-remotes.md b/docs/documentation/multiple-heroku-remotes.md
@@ -0,0 +1,24 @@
+## 8) Deploying different versions
+
+We have found its helpful to have at least two different versions of a prototype online.
+
+1. **dev** - an experimental version, where things change rapidly and may well be broken
+2. **master** - a stable version, where other people can rely on seeing a working version of the prototype that you're happy with
+
+If you've followed the instructions above, you already have a master version online.
+
+Create a local dev branch:
+
+`git checkout -b dev`
+
+Add a dev heroku remote:
+
+`heroku apps:create --remote dev [dev-name]`
+
+Push to the dev remote:
+
+`git push dev dev:master`
+
+Now your dev branch will be live at [dev-name].herokuapp.com
+
+Note that you have to add 'dev:master' this time - if you dont add this, Heroku assumes you want the master branch to be deployed.
diff --git a/docs/principles.md → docs/documentation/principles.md b/docs/principles.md → docs/documentation/principles.md
diff --git a/docs/guides/publishing-on-heroku.md → docs/documentation/publishing-on-heroku.md b/docs/guides/publishing-on-heroku.md → docs/documentation/publishing-on-heroku.md
@@ -77,7 +77,3 @@ After your work is deployed, you will be able to view it on the web by visiting
 You can run `heroku open` to open your prototype in a browser.
 
 > Heroku puts apps to sleep that haven’t been accessed in a while - so if you’ve not visited your prototype for a while it may take a few seconds to open.
-
-
----
-[Documentation index](../README.md)
diff --git a/docs/guides/setting-up-git.md → docs/documentation/setting-up-git.md b/docs/guides/setting-up-git.md → docs/documentation/setting-up-git.md
diff --git a/docs/documentation/thing.md b/docs/documentation/thing.md
@@ -0,0 +1 @@
+# This is a heading
diff --git a/docs/tips-and-tricks.md → docs/documentation/tips-and-tricks.md b/docs/tips-and-tricks.md → docs/documentation/tips-and-tricks.md
diff --git a/docs/updating-the-kit.md → docs/documentation/updating-the-kit.md b/docs/updating-the-kit.md → docs/documentation/updating-the-kit.md
diff --git a/docs/writing-css.md → docs/documentation/writing-css.md b/docs/writing-css.md → docs/documentation/writing-css.md
-Original file line number
+Diff line change
@@ Expand Up @@
     ---
     [Next page (requirements)](requirements.md)
-    ---
-    [Documentation index](../README.md)