From 477dc6c4b62aad9102cb2c86f1d722ea996270d5 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Mon, 21 Nov 2016 09:17:39 -0800 Subject: Hotfix: Fixing 'more' channel truncating purpose (#4581) * Fixing more channel purpose * Fixing to match master --- webapp/sass/components/_modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/sass') diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index f89fb5c40..beb9ee8a1 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -612,7 +612,7 @@ .more-modal__row { border-bottom: 1px solid $light-gray; display: flex; - min-height: 50px; + min-height: 70px; padding: 8px 15px; } -- cgit v1.2.3-1-g7c22 From a9824a3653a30779f7fd0cc62e329c988f02b519 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 21 Nov 2016 12:17:46 -0500 Subject: Hotfix: PLT-4779 Fixing scrolling on loading a channel and missing DM channel headers (#4584) * Added all parameters to call tracker ids when getting profiles * Changed channel header rendering to not depend on knowing all users in a DM channel * Added comment about a race condition in UserActions.populateDMChannelsWithProfiles * Added a fixed-height placeholder for the ChannelHeader when its state isn't valid for rendering --- webapp/sass/layout/_headers.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/sass') diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index a8344b1c5..fd1c42135 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -1,7 +1,7 @@ @charset 'UTF-8'; .channel-header { - @include flex(0 0 56px); + @include flex(0 0 57px); border-left: none; font-size: 14px; line-height: 56px; -- cgit v1.2.3-1-g7c22