Skip to content

Commit

Permalink
Merge pull request #8047 from RocketChat/fix-scroll-on-texarea
Browse files Browse the repository at this point in the history
[FIX] Scroll on messagebox
  • Loading branch information
engelgabriel authored and rodrigok committed Sep 14, 2017
1 parent 4b60f88 commit 10119ea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
&__textarea {
width: 100%;
height: 15px;
min-height: 21px;
max-height: 155px;

padding: 0;
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/lib/textarea-autogrow.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
}

if(newHeight === $self[0].offsetHeight){
return false;
return true;
}

if(maxHeight <= newHeight){
Expand Down

0 comments on commit 10119ea

Please sign in to comment.