From 2461069254d85485e2743eb874ffe8ef8c84b4bf Mon Sep 17 00:00:00 2001 From: narender2031 Date: Thu, 15 Oct 2020 20:16:26 +0530 Subject: [PATCH] fix request center UI (#10824) * fix request center UI * remove not require css * removed not used classes --- app/assets/stylesheets/chat.scss | 3 ++- app/javascript/chat/RequestManager/RequestManager.jsx | 2 +- app/javascript/chat/channelRequest.jsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) 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 ( -
+
{channelJoiningRequests.length <= 0 && userInvitations.length <= 0 ? ( diff --git a/app/javascript/chat/channelRequest.jsx b/app/javascript/chat/channelRequest.jsx index bf79aa750..49f74bfaf 100644 --- a/app/javascript/chat/channelRequest.jsx +++ b/app/javascript/chat/channelRequest.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { Button } from '@crayons'; const ChannelRequest = ({ resource: data, handleJoiningRequest }) => ( -
+

Hey {data.user.name} !

You are not a member of this group yet. Send a request to join.