Merge pull request #7781 from RocketChat/hotfix

[FIX] Fix flex tab not opening and getting offscreen
RocketChat · Aug 17, 2017 · 4fd2463 · 4fd2463
2 parents 9a9f158 + 77ea555
commit 4fd2463
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/rocketchat-theme/client/imports/base.css b/packages/rocketchat-theme/client/imports/base.css
@@ -2130,6 +2130,7 @@ label.required::after {
 	flex: 1;
 	display: flex;
 	flex-direction: column;
+	max-width: 100%;
 
 	&-wrapper {
 		height: 100%;

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
@@ -320,7 +320,7 @@ Template.room.events({
 		return Meteor.setTimeout(() => t.sendToBottomIfNecessaryDebounced(), 100);
 	},
 
-	'click .messages-container'() {
+	'click .messages-container-main'() {
 		const user = Meteor.user();
 
 		if ((Template.instance().tabBar.getState() === 'opened') && user && user.settings && user.settings.preferences && user.settings.preferences.hideFlexTab) {