From 1aeb629d8eae508c752cb443db09aba1ba251838 Mon Sep 17 00:00:00 2001
From: dsc <dsc@wikimedia.org>
Date: Thu, 29 Mar 2012 01:33:29 -0700
Subject: [PATCH] Minor layout tweaks.

---
 www/css/layout.styl |   16 ++++++++++------
 www/layout.jade     |   20 ++++++--------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/www/css/layout.styl b/www/css/layout.styl
index 244ed1b..048da3f 100644
--- a/www/css/layout.styl
+++ b/www/css/layout.styl
@@ -20,9 +20,13 @@ header, footer, #content
     
     & > .inner
         position relative
-        // width 80%
-        // min-width 960px
-        // margin 0 auto
+        margin 0 auto
+        max-width 960px
+        
+        &.fluid-inner
+            width 80%
+            min-width 960px
+            max-width none
     
     // .spacer offsets #content to pad for header
     .spacer
@@ -81,9 +85,9 @@ header
     background-color $main_bgcolor
     box-shadow 0px 0px 6px 2px rgba(0,0,0,0.3)
     
-    h1
-        font-size 150%
-        margin 0 0 0 1em
+    // h1
+    //     font-size 150%
+    //     margin 0 0 0 1em
 
 footer
     z-index 1
diff --git a/www/layout.jade b/www/layout.jade
index 6b7f48f..c6859c1 100644
--- a/www/layout.jade
+++ b/www/layout.jade
@@ -17,21 +17,11 @@ html
             link(type="image/x-icon", rel="shortcut icon", href="/favicon.ico")
             
             block title
-                title Kraken
+                title GraphKit
     
     body
         block body
-            //- 
-                header
-                    block header
-                        h1: a(href="/") Kraken
-                        block nav
-                            nav#menu: ul
-                                block menu-items
-                                    li.home Home
-            
             section#content
-                //- .spacer
                 .inner
                     block content
             
@@ -44,11 +34,13 @@ html
                         var VERSION = !{ JSON.stringify(version)  };
                         var ENV     = !{ JSON.stringify(NODE_ENV) };
                     
-                    for src in sources(WWW+'/modules.yaml')
-                        script(src=src+"?"+version)
+                    block lib-scripts
+                        for src in sources(WWW+'/modules.yaml')
+                            script(src=src+"?"+version)
                     
                     block page-scripts
                     
-                    script(src="/js/kraken/main.js?"+version)
+                    block main-scripts
+                        script(src="/js/kraken/main.js?"+version)
             
 
-- 
1.7.0.4