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

public/javascripts/view.js

@@ -12,7 +12,9 @@ $(document).ready(function(){
 
   $("label").inFieldLabels();
 
-  $('#flash_notice, #flash_error, #flash_alert').delay(4000).animate({
+  $('#flash_notice, #flash_error, #flash_alert').animate({
+    top: 0
+  }).delay(4000).animate({
     top: -100 
   }, $(this).remove());
 

public/stylesheets/application.css

@@ -34,7 +34,7 @@ h3 {
   z-index: 100;
   position: fixed;
   color: white;
-  top: 0;
+  top: -100px;
   left: 0;
   width: 100%;
   padding: 1em;

public/stylesheets/sass/application.sass

@@ -42,7 +42,7 @@ h3
   :position fixed
   :color #fff
 
-  :top 0
+  :top -100px
   :left 0
 
   :width 100%