Skip to content

Commit 606df32

Browse files
author
Tony Guntharp
committed
Merge pull request #59 from magicmarkker/master
Password errors do strange things to the layout
2 parents 26da0df + 4006ad2 commit 606df32

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

app/assets/javascripts/backbone/views/chatbox.js.coffee

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ class Kandan.Views.Chatbox extends Backbone.View
3636

3737
activity.save({},{success: (model, response)->
3838
$("#activity-c#{model.cid}").attr("id", "activity-#{model.get('id')}")
39+
$scrollbox = $(event.target).parent().find(".paginated-activities")
40+
$scrollbox.prop("scrollTop", $scrollbox.prop('scrollHeight'))
3941
})
4042

4143
render: ()->

app/assets/stylesheets/_base.sass

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ body
123123
.devise
124124
padding-top: 20px
125125

126-
.devise p,h1,h2,
126+
.devise p, .devise div,h1,h2,
127127
margin-left: auto
128128
margin-right: auto
129129
width: 600px

0 commit comments

Comments
 (0)