diff --git a/app/assets/stylesheets/chat.scss b/app/assets/stylesheets/chat.scss index 7eaef5633..c67129114 100644 --- a/app/assets/stylesheets/chat.scss +++ b/app/assets/stylesheets/chat.scss @@ -244,7 +244,7 @@ font-size: var(--fs-base); flex-grow: 1; height: 300px; - overflow-y: auto; + overflow-y: hidden; overflow-x: hidden; text-align: left; overscroll-behavior-y: contain; @@ -1044,6 +1044,7 @@ min-height: 2.5rem; resize: vertical; max-height: 8rem; + overflow: hidden; } .composer-btn-group { diff --git a/app/javascript/chat/RequestManager/RequestManager.jsx b/app/javascript/chat/RequestManager/RequestManager.jsx index 6f14d1745..1fbeafd91 100644 --- a/app/javascript/chat/RequestManager/RequestManager.jsx +++ b/app/javascript/chat/RequestManager/RequestManager.jsx @@ -130,7 +130,7 @@ export default class RequestManager extends Component { const { channelJoiningRequests, userInvitations } = this.state; return ( -