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

Conflicts: public/stylesheets/sass/application.sass
2010-12-02 19:18:21 -08:00 · 2010-12-02 19:18:21 -08:00 · 9bd77916a8
commit 9bd77916a8
parent 9ad9e205a5 8aaedb4240
1 changed files with 2 additions and 0 deletions
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@ -913,6 +913,8 @@ label
      :position absolute
      :top 5px

+#file_upload
+  :z-index 10
 .field_with_submit
  input[type='text']
    :width 82%