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

Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass

app/views/layouts/application.html.haml

@@ -7,7 +7,7 @@
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
     
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
-    = stylesheet_link_tag "application", "ui", 'bubble'
+    = stylesheet_link_tag "application", "ui"
 
     = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1" 
     = stylesheet_link_tag "fileuploader" 
@@ -30,7 +30,7 @@
       = content_tag :div, msg, :id => "flash_#{name}"
 
     %header
-      .container
+      .container{:style => "position:relative;"}
         #diaspora_text{:href => root_path}
           = link_to "DIASPORA*", root_path
           %span.sub_text
@@ -40,18 +40,16 @@
             = link_to "photos", albums_path
 
         #session_action
-          #global_search
-            = form_tag(people_path, :method => 'get') do
-              %label{:for => 'q'} Search
-              = text_field_tag 'q'
-
-          %ul#user_menu
-            %li
-              = owner_image_tag 
-              = link_to current_user.real_name, current_user.person
-            %li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
-            %li.settings= link_to "edit profile", edit_user_path(current_user)
-            %li.logout= link_to "logout", destroy_user_session_path
+          %ul
+            %li#global_search
+              = form_tag(people_path, :method => 'get') do
+                %label{:for => 'q'} Search
+                = text_field_tag 'q'
+
+            %li= link_to current_user.real_name, current_user.person
+            %li= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
+            %li= link_to "edit profile", edit_user_path(current_user)
+            %li= link_to "logout", destroy_user_session_path
 
         = render "shared/aspect_nav"
 

public/images/glyphish-icons/Read me first - license.txt

-Created by Joseph Wain (see http://penandthink.com) at and probably downloaded from http://glyphish.com
-
-This work is licensed under the Creative Commons Attribution 3.0 United States License. To view a copy of this license, visit http://creativecommons.org/licenses/by/3.0/us/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
-
-You are free to share it and to remix it remix under the following conditions:
-
-* You must attribute the work in the manner specified by the author (SEE BELOW).
-* For any reuse or distribution, you must make clear to others the license terms of this work.
-* The above conditions can be waived if you get permission from the copyright holder (send me an email!).
-
-ATTRIBUTION -- a note reading "icons by Joseph Wain / glyphish.com" or similar, plus a link back to glyphish.com from your app's website, is the preferred form of attribution. Also acceptable would be, like, a link from within your iPhone application, or from the iTunes store page, but those aren't as useful to other people. If none of these work for you, please contact hello@glyphish.com and we can work something out.
-
-USE WITHOUT ATTRIBUTION -- If attribution is not possible, workable or desirable for your application, contact hello@glyphish.com for commercial non-attributed licensing terms.
\ No newline at end of file