fix header styling when not signed in; remove ilya's static page

app/views/layouts/_header.html.haml

@@ -3,85 +3,10 @@
 -#   the COPYRIGHT file.
 
 .container{:style => "position:relative;"}
+  = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :style => 'position:relative;top:5px;'), root_path
 
-  - if current_user
+  %ul#landing_nav
-    = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :class => "diaspora_header_logo"), multi_path
+    %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
-  - else
+    %li= link_to 'github', "https://github.com/diaspora/diaspora"
-    = link_to image_tag('logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path
+    %li= link_to t('.blog'), 'http://blog.joindiaspora.com/'
-
+    %li= link_to t('.login'), new_user_session_path, :class => 'login'
-  - if !current_user
-    .right
-      %ul#landing_nav
-        %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
-        %li= link_to 'github', "https://github.com/diaspora/diaspora"
-        %li= link_to t('.blog'), 'http://blog.joindiaspora.com/'
-        %li= link_to t('.login'), new_user_session_path, :class => 'login'
-
-  - elsif (current_user || !@landing_page)
-    #global_search
-      = form_tag(people_path, :method => 'get', :class => "search_form") do
-        = text_field_tag 'q', params[:q], :placeholder => t('find_people'), :type => 'search', :results => 5
-
-    #nav_badges
-      #home_badge.badge
-        = link_to multi_path, :title => t('_home') do
-          = image_tag 'icons/home_grey.png', :alt => t('_home')
-
-      #notification_badge.badge
-        = link_to notifications_path, :title => new_notification_text(@notification_count) do
-          = image_tag 'icons/notifications_grey.png', :id => "notification-flag", :alt => new_notification_text(@notification_count)
-          .badge_count{:class => ("hidden" if @notification_count == 0)}
-            = @notification_count
-
-      #message_inbox_badge.badge
-        = link_to conversations_path, :title => new_message_text(@unread_message_count) do
-          = image_tag 'icons/mail_grey.png', :alt => new_message_text(@unread_message_count)
-          .badge_count{:class => ("hidden" if @unread_message_count == 0)}
-            = @unread_message_count
-
-    #notification_dropdown
-      .header
-        .right
-          = link_to t('notifications.index.mark_all_as_read'), read_all_notifications_path
-          \|
-          = link_to t('.view_all'), notifications_path, :id => "view_all_notifications"
-        %h4
-          = t('.recent_notifications')
-      .notifications
-        .ajax_loader
-          = image_tag("ajax-loader.gif")
-
-    #hovercard_container
-      #hovercard
-        %img.avatar
-        %h4
-          %a.person
-        %p.handle
-        #hovercard_dropdown_container
-
-        .hovercard_footer
-          .footer_container
-            .hashtags
-
-    %ul#user_menu.dropdown
-      %li
-        .right
-          ▼
-        .avatar
-          = owner_image_tag(:thumb_small)
-        = link_to current_user.name, '#', :title => current_user.diaspora_handle
-      %li= link_to t('.profile'), local_or_remote_person_path(current_user.person)
-      %li= link_to t('_contacts'), contacts_link
-      %li= link_to t('.settings'), edit_user_path
-      -if current_user.admin?
-        %li= link_to t('.admin'), user_search_path
-      %li= link_to t('.logout'), destroy_user_session_path
-
-  #lightbox
-    #lightbox-content
-      = link_to "[x] close", '#', :id => 'lightbox-close-link'
-      %img#lightbox-image
-      #lightbox-imageset
-
-  #lightbox-backdrop
-

app/views/layouts/application.html.haml

@@ -97,7 +97,7 @@
       #notifications
 
     - unless current_user
-      %header{:class=>('landing')}
+      %header
         = render 'layouts/header'
 
     = render 'templates/templates'

public/stylesheets/sass/application.sass

@@ -174,10 +174,6 @@ header
   :border
     :bottom 1px solid #444
 
-  &.fixit
-    :position fixed
-    :top -30px
-
   a
     :color #CCC
     :color rgb(147,147,147)
@@ -239,7 +235,7 @@ header
             :right 15px
           &:hover
             :background
-              :color #222
+              :color transparent
             :text
               :decoration none
           &:focus
@@ -1931,13 +1927,19 @@ ul#landing_nav
   :margin 0
   :padding 0
 
-  :font
+  :position absolute
-    :size 14px
+  :top 4px
+  :right 0
 
   > li
     :display inline
     :margin
       :right 0.5em
+
+    &:last-child
+      :margin
+        :right 0
+
     a
       :color $blue