now have both full width layout and normal layout

public/css/main.less

@@ -29,9 +29,14 @@ html {
   min-height: 100%;
 }
 
-body {
+body.top-and-bottom-margins {
+  padding-top: 80px;
+  margin-bottom: 60px;
+}
+
+body.no-top-and-bottom-margins {
   padding-top: 50px;
-//  margin-bottom: 60px;
+  margin-bottom: 40px;
 }
 
 h1, h2 {

views/bonfire/bonfire.jade

@@ -1,4 +1,4 @@
-extends ../layout
+extends ../layout-wide
 block content
     script(src='/js/lib/codemirror/lib/codemirror.js')
     script(src='/js/lib/codemirror/addon/edit/closebrackets.js')

views/bonfire/show.jade

@@ -1,4 +1,4 @@
-extends ../layout
+extends ../layout-wide
 block content
 
     script(src='/js/lib/codemirror/lib/codemirror.js')

views/layout-wide.jade

@@ -0,0 +1,33 @@
+doctype html
+html(ng-app='profileValidation', lang='en')
+  head
+    script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
+    script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js")
+    script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js")
+    link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico')
+    link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css')
+    link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
+    link(rel='stylesheet', href='//code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css')
+    include partials/meta
+    title #{title} | Free Code Camp
+    meta(charset='utf-8')
+    meta(http-equiv='X-UA-Compatible', content='IE=edge')
+    meta(name='viewport', content='width=device-width, initial-scale=1.0')
+    meta(name='csrf-token', content=_csrf)
+    != css('main')
+
+  body.no-top-and-bottom-margins
+    include partials/navbar-wide
+    include partials/flash
+    block content
+    include partials/footer
+    != js('application')
+script.
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-55446531-1', 'auto');
+      ga('require', 'displayfeatures');
+      ga('send', 'pageview');
+script(src="//cdn.optimizely.com/js/999692993.js")

views/layout.jade

@@ -16,8 +16,9 @@ html(ng-app='profileValidation', lang='en')
     meta(name='csrf-token', content=_csrf)
     != css('main')
 
-  body
+  body.top-and-bottom-margins
-    include partials/navbar
+    include partials/navbar-narrow
+    .container
       include partials/flash
       block content
     include partials/footer

views/partials/navbar-narrow.jade

@@ -0,0 +1,3 @@
+nav.navbar.navbar-default.navbar-fixed-top.nav-height
+    .container
+        include ./navbar

views/partials/navbar-wide.jade

@@ -0,0 +1,2 @@
+nav.navbar.navbar-default.navbar-fixed-top.nav-height
+    include ./navbar

views/partials/navbar.jade

@@ -1,5 +1,4 @@
-nav.navbar.navbar-default.navbar-fixed-top.nav-height
+.navbar-header
-    .navbar-header
     button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')
         span.sr-only Toggle navigation
         span.icon-bar
@@ -7,7 +6,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
         span.icon-bar
     a.navbar-brand(href='/')
         img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at Free Code Camp logo')
-    .collapse.navbar-collapse
+.collapse.navbar-collapse
     ul.nav.navbar-nav.navbar-right.hamburger-dropdown
         - if (!cc)
             li

views/resources/live-pair-programming.jade

@@ -1,23 +1,6 @@
-doctype html
+extends ../layout-wide
-html(ng-app='profileValidation', lang='en')
+block content
-    head
+    include ../partials/navbar-wide
-        script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
-        script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js")
-        script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js")
-        link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico')
-        link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css')
-        link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
-        link(rel='stylesheet', href='//code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css')
-        include ../partials/meta
-        title #{title} | Free Code Camp
-        meta(charset='utf-8')
-        meta(http-equiv='X-UA-Compatible', content='IE=edge')
-        meta(name='viewport', content='width=device-width, initial-scale=1.0')
-        meta(name='csrf-token', content=_csrf)
-    != css('main')
-    body
-        block content
-            include ../partials/navbar
     .panel.panel-primary
         .panel-heading.landing-panel-heading.text-center Live Pair Programming
         .panel-body
@@ -71,21 +54,3 @@ html(ng-app='profileValidation', lang='en')
                     a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free)
                     br
                     br
-            include ../partials/footer
-            != js('application')
-            script.
-                (function (i, s, o, g, r, a, m) {
-                    i['GoogleAnalyticsObject'] = r;
-                    i[r] = i[r] || function () {
-                        (i[r].q = i[r].q || []).push(arguments)
-                    }, i[r].l = 1 * new Date();
-                    a = s.createElement(o),
-                            m = s.getElementsByTagName(o)[0];
-                    a.async = 1;
-                    a.src = g;
-                    m.parentNode.insertBefore(a, m)
-                })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-                ga('create', 'UA-55446531-1', 'auto');
-                ga('require', 'displayfeatures');
-                ga('send', 'pageview');
-            script(src="//cdn.optimizely.com/js/999692993.js")