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

app/views/layouts/application.html.haml

@@ -47,8 +47,7 @@
           %ul
             %li#global_search
               = form_tag(people_path, :method => 'get') do
-                %label{:for => 'q'} Search
-                = text_field_tag 'q'
+                = text_field_tag 'q', nil, :placeholder => "Search", :type => 'search', :results => 5
 
             %li= link_to current_user.real_name, current_user.person
             %li= link_to "settings", edit_user_path(current_user)

public/stylesheets/sass/application.sass

@@ -542,6 +542,7 @@ li.message .from .destroy_link
 
 input[type='text'],
 input[type='password'],
+input[type="search"],
 textarea
   :font
     :family 'Arial', 'Helvetica', sans-serif
@@ -1019,3 +1020,9 @@ ul#settings_nav
       :size 80px
     :display inline-block
 
+input[type="search"]
+  :-webkit-appearance textfield
+
+header
+  input[type="search"]
+    :width 200px