Rearrange layouts

assets/linker/styles/app.less

@@ -10,7 +10,7 @@ body {
 }
 #page {
     .interior {
-        padding: 20px 40px;
+        padding: 0 40px 20px;
         background-color: rgba(0,0,0,0.8);
         box-shadow: 0px 0px 20px #000;
 

assets/linker/styles/nav.less

@@ -1,6 +1,9 @@
-nav a {
+nav {
-    color: #fff;
+    margin-bottom: 20px;
-    &:hover {
+    a {
-        color: #999;
+        color: #fff;
+        &:hover {
+            color: #999;
+        }
     }
 }

views/interior-layout.jade

@@ -1,36 +1,9 @@
-doctype html
+extends layout
-html(lang="en",ng-app="lunchApp")
-    head
-        include head
-    body
-        .container
-            #page
-                .interior
-                    include nav
-                    h1
-                        block pagetitle
 
-                    block content
+block content
+    .interior
+        include includes/nav
+        h1
+            block pagetitle
 
-        // TEMPLATES
+        block interiorcontent
-        
-        // TEMPLATES END
-
-        // SCRIPTS
-        script(type="text/javascript", src="/linker/js/vendor/socket.io.js")
-        script(type="text/javascript", src="/linker/js/vendor/sails.io.js")
-        script(type="text/javascript", src="/linker/js/vendor/jquery-2.1.0.js")
-        script(type="text/javascript", src="/linker/js/vendor/bootstrap.js")
-        script(type="text/javascript", src="/linker/js/vendor/angular.js")
-        script(type="text/javascript", src="/linker/js/vendor/angular-route.js")
-        script(type="text/javascript", src="/linker/js/vendor/underscore.js")
-        script(type="text/javascript", src="/linker/js/app.js")
-        script(type="text/javascript", src="/linker/js/controllers/module.js")
-        script(type="text/javascript", src="/linker/js/analytics.js")
-        script(type="text/javascript", src="/linker/js/controllers/body-controller.js")
-        script(type="text/javascript", src="/linker/js/controllers/create-order-controller.js")
-        script(type="text/javascript", src="/linker/js/controllers/create-run-controller.js")
-        script(type="text/javascript", src="/linker/js/controllers/run-controller.js")
-        script(type="text/javascript", src="/linker/js/services/socket.js")
-        script(type="text/javascript", src="/linker/js/vendor/jquery.backstretch.min.js")
-        // SCRIPTS END

views/layout.jade

@@ -1,7 +1,7 @@
 doctype html
 html(lang="en",ng-app="lunchApp")
     head
-        include head
+        include includes/head
     body(ng-controller="BodyCtrl")
         .container
             #page

views/run/create.jade

@@ -1,10 +1,10 @@
-include ../interior-layout
+extends ../interior-layout
 
 block pagetitle
     span.glyphicon.glyphicon-chevron-right
     | start a new lunch run
     
-block content
+block interiorcontent
     .create-run-form(ng-controller='CreateRunCtrl')
         form(name='form',novalidate,role='form')
             section.name