Merge branch 'master' of github.com:diaspora/diaspora_rails

app/views/layouts/session_wall.html.haml

@@ -11,6 +11,12 @@
     /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
     = javascript_include_tag 'jquery142'
   
+    = csrf_meta_tag
+    = yield(:head)
+
+  %body
+
+    .container
       :plain
         <!--[if lt IE 8]>
         <div style='border: 1px solid #F7941D; background: #FEEFDA; text-align: center; clear: both; height: 75px; position: relative;'>
@@ -30,11 +36,7 @@
         <![endif]-->
     
     
-    = csrf_meta_tag
-    = yield(:head)
     
-  %body
-    .container
       - flash.each do |name, msg|
         = content_tag :div, msg, :id => "flash_#{name}"
       - if User.first  

config/routes.rb

@@ -1,4 +1,4 @@
-lsDiaspora::Application.routes.draw do |map|
+Diaspora::Application.routes.draw do |map|
   resources :blogs
   resources :bookmarks
   resources :friends

public/stylesheets/application.css

@@ -137,7 +137,6 @@ h1 {
   line-height: 36px; }
   h1 p.description, h1 span.description {
     font-weight: 200;
-    font-family: "helvetica neue", "lucida grande", "sans-serif";
     color: #999999;
     padding: 0.1em; }