Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] search results position on sidebar #7881

Merged
merged 1 commit into from
Aug 25, 2017
Merged

[FIX] search results position on sidebar #7881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
&__toolbar-search {
position: absolute;
z-index: 1;
top: var(--sidebar-header-height);

left: 0;

overflow-y: auto;
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-message/client/popup/messagePopup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template name="messagePopup">
{{#if isOpen}}
{{#if sidebar}}
<ul class="rooms-list__list rooms-list__toolbar-search">
<ul class="rooms-list__list rooms-list__toolbar-search" style="top: {{sidebarHeaderHeight}}">
{{#each data}}
{{> Template.dynamic template=../template data=toolbarData }}
{{/each}}
Expand Down
3 changes: 3 additions & 0 deletions packages/rocketchat-ui-message/client/popup/messagePopup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,5 +284,8 @@ Template.messagePopup.helpers({
},
toolbarData() {
return {...Template.currentData(), toolbar: true};
},
sidebarHeaderHeight() {
return `${ document.querySelector('.sidebar__header').offsetHeight }px`;
}
});