Merge pull request #8299 from RocketChat/scroll-admin

[FIX] Amin menu not showing all items & File list breaking line
RocketChat · Sep 26, 2017 · 1156ad1 · 1156ad1
1 parent ab63393
commit 1156ad1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -6,6 +6,8 @@
 
 	height: 100%;
 
+	flex: 1 1 auto;
+
 	&__list {
 		&:not(:last-child) {
 			margin-bottom: 32px;

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -20,6 +20,10 @@
 	&-light {
 		position: absolute;
 
+		display: flex;
+
+		flex-direction: column;
+
 		width: 100%;
 
 		height: 100%;

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3757,7 +3757,8 @@ body:not(.is-cordova) {
 			margin-bottom: 10px;
 		  }
 		}
-		& a .file-name {
+
+		& .file-name {
 			display: block;
 
 			padding: 10px 5px;