From feb6549a02bba677f4639f1576b4efd0fe6adf24 Mon Sep 17 00:00:00 2001
From: Eric Meyer <eric@oddbird.net>
Date: Mon, 26 Apr 2010 17:06:56 -0600
Subject: [PATCH] more sensible nav markup/structure

---
 doc-src/content/stylesheets/screen.sass | 28 +++++++-------------
 doc-src/layouts/main.haml               | 35 +++++++++++++------------
 2 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/doc-src/content/stylesheets/screen.sass b/doc-src/content/stylesheets/screen.sass
index d5d40caa..93ccd1e0 100644
--- a/doc-src/content/stylesheets/screen.sass
+++ b/doc-src/content/stylesheets/screen.sass
@@ -56,12 +56,14 @@ header[role="banner"]
   height: $base-rhythm-unit
   border-color: #cccccc
   background-color: #eeeeee
+  .container
+    +container
+    +pie-clearfix
+    overflow: visible
   ul
     +horizontal-list
-    +container
-    position: relative
-    z-index: 2
     overflow: visible
+    position: relative
     li
       top: -$base-rhythm-unit * 0.5
       margin-bottom: -$base-rhythm-unit * 0.5
@@ -94,29 +96,19 @@ header[role="banner"]
 +active-docs(".blueprint", "/docs/reference/blueprint/")
 
 #version
-  // XXX This is placeholder styling. Susify me.
-  color: #999
   +adjust-font-size-to(14px)
-  z-index: 3
+  +float(left)
+  margin-left: 1.5em
+  color: #999
   .number
     color: #666
-  float: right
-  margin-right: 400px
-
+    
 #search-docs
-  position: absolute
-  z-index: 1
-  top: 0
-  left: 0
-  width: 100%
   color: #999
-  form
-    +container
   p
     +columns(3)
     +omega
-    +leader(.25)
-    +trailer(0)
+    margin: 0
     label
       +float(left)
       width: columns(1,3) + gutter(3)*.5
diff --git a/doc-src/layouts/main.haml b/doc-src/layouts/main.haml
index 63ef2114..05e543c7 100644
--- a/doc-src/layouts/main.haml
+++ b/doc-src/layouts/main.haml
@@ -31,24 +31,25 @@
             %li
               %a{:href => "/docs/tutorials/"} tutorials
     %nav#docs-nav{:role => "navigation"}
-      %ul
-        %li
-          %a{:href => "/docs/"} introduction
-        %li
-          %a{:href => "/docs/reference/compass/"} core
-        %li
-          %a{:href => "/docs/reference/blueprint/"} blueprint
-        /
+      .container
+        %ul
           %li
-            %a{:href => "/docs/plugins/"} plugins
-      #version
-        Current Version:
-        %a.number(href="/CHANGELOG/")= compass_version
-      #search-docs
-        %form
-          %p
-            %label{:for => "search"} search
-            %input#search{:name => "search", :type => "text", :value => "", :placeholder => "Search"}
+            %a{:href => "/docs/"} introduction
+          %li
+            %a{:href => "/docs/reference/compass/"} core
+          %li
+            %a{:href => "/docs/reference/blueprint/"} blueprint
+          /
+            %li
+              %a{:href => "/docs/plugins/"} plugins
+        #version
+          Current Version:
+          %a.number(href="/CHANGELOG/")= compass_version
+        #search-docs
+          %form
+            %p
+              %label{:for => "search"} search
+              %input#search{:name => "search", :type => "text", :value => "", :placeholder => "Search"}
     - if @item[:content_for_module_nav]
       %nav#module-nav= @item[:content_for_module_nav]
     #page= yield