Merge pull request #59 from magicmarkker/master

Password errors do strange things to the layout
kandanapp · Feb 8, 2013 · 606df32 · 606df32
2 parents 26da0df + 4006ad2
commit 606df32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/assets/javascripts/backbone/views/chatbox.js.coffee b/app/assets/javascripts/backbone/views/chatbox.js.coffee
@@ -36,6 +36,8 @@ class Kandan.Views.Chatbox extends Backbone.View
 
     activity.save({},{success: (model, response)->
       $("#activity-c#{model.cid}").attr("id", "activity-#{model.get('id')}")
+      $scrollbox = $(event.target).parent().find(".paginated-activities")
+      $scrollbox.prop("scrollTop", $scrollbox.prop('scrollHeight'))
     })
 
   render: ()->

diff --git a/app/assets/stylesheets/_base.sass b/app/assets/stylesheets/_base.sass
@@ -123,7 +123,7 @@ body
 .devise
   padding-top: 20px
 
-.devise p,h1,h2,
+.devise p, .devise div,h1,h2,
   margin-left: auto
   margin-right: auto
   width: 600px