From 8b7621793fe5f8fa55c955045a71821c53d4759f Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 17 Jun 2013 01:26:35 -0700
Subject: start of new ui - css changes, layout changes, navigation changes.

---
 app/views/layouts/application.html.haml | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'app/views/layouts/application.html.haml')

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e6d22f0..719d699 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -9,15 +9,27 @@
         = csrf_meta_tags
         = yield(:head)
   %body
-    %header.navbar.navbar-fixed-top
-      %nav.navbar-inner
-        .container
-          = render 'layouts/navigation'
-    #main{:role => "main"}
-      .container
-        .content
-          .row
+    #masthead
+      - if logged_in?
+        = render 'layouts/masthead'
+      - else
+        = render 'layouts/masthead_large'
+    #main
+      .container-fluid
+        - if logged_in?
+          .row-fluid
             .span12
+              = render 'layouts/header'
+          .row-fluid
+            .span2
+              = render 'layouts/navigation'
+            .span10
               = render 'layouts/messages'
               = yield
-          %footer
+        - else
+          .row-fluid
+            .span12
+              = render 'layouts/messages'
+              = yield
+    #footer
+      = render 'layouts/footer'
-- 
cgit v1.2.3