Merge branch 'master' into develop

Signed-off-by: Wolfr <johan.ronsse@gmail.com>

# Conflicts:
#	content/styleguide/component-group.pug
#	content/styleguide/doc.pug
#	content/styleguide/index.pug
#	core/styleguide/component-group.pug
#	core/styleguide/doc.pug
#	core/styleguide/index.pug
#	core/templates/styleguide/component-group.pug
#	core/templates/styleguide/doc.pug
#	core/templates/styleguide/index.pug

.nvmrc

@@ -1 +1 @@
-8.3
+10.14.1

core/templates/styleguide/component-group.pug

@@ -0,0 +1,17 @@
+extends index
+
+block append pageVariables
+    - var pageTitle = componentGroup.docs && componentGroup.docs.attributes.title || componentGroup.group.id
+    - var moduleTitle = pageTitle + ' - Styleguide'
+
+block content
+
+    if !componentGroup.docs
+        h1.br-componentgroup-header(class=styleguideComponentGroupHeaderClass)= componentGroup.group.id
+    else
+        h1.br-componentgroup-header(class=styleguideComponentGroupHeaderClass)= componentGroup.docs.attributes.title || componentGroup.group.id
+        .br-content(class=styleguideRichContentClass)
+            != componentGroup.docs.body
+
+    each component in componentGroup.components
+        +sample(component)

core/templates/styleguide/doc.pug

@@ -0,0 +1,7 @@
+extends index
+
+block append pageVariables
+    - var moduleTitle = doc.attributes.title + ' - Styleguide'
+
+block content
+    != doc.body

core/templates/styleguide/index.pug

@@ -0,0 +1,24 @@
+extends /templates/_layouts/master
+
+block append pageVariables
+    - var htmlClass = 'br-styleguide br-styleguide-default-styles-active'
+
+block body
+
+    .br-styleguide-container
+        .br-styleguide-container-inner
+            .br-styleguide-navigation-holder
+                unless styleguideHideBrand
+                    h1.br-styleguide-brand-heading(class=styleguideBrandClass)
+                        a.br-reset-link-styling(href="/styleguide" class=styleguideResetLinkStylingClass) #{projectTitle}
+
+                block nav
+                    include ../includes/styleguide-nav
+
+            .br-styleguide-content
+                .br-styleguide-content-inner
+                    block content
+                        block homeContent
+                            // Place style guide introduction here. By default redirects to first docs page.
+                            script.
+                                window.location = "/styleguide/docs/introduction.html"

gulpfile.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const gulp = require('gulp');
-const inquirer = require('inquirer');
 const runSequence = require('run-sequence');
 
 const browserSync = require('./core/tasks/browser-sync');