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.

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

Fix the conversation horizontal scrollbar when only few conversations #560 #653

Merged
merged 3 commits into from Nov 26, 2019

Conversation

@Bilb
Copy link
Collaborator

Bilb commented Nov 25, 2019

First time contributor checklist:

Contributor checklist:

Yarn ready does not pass but I do not think it comes from this issue:

 /Pro/contribs/loki-messenger/js/modules/loki_file_server_api.js
233:43  error  'DEVICE_MAPPING_ANNOTATION_KEY' is not defined  no-undef

Description

Do not show a vertical scrollbar when there are not enough conversations in the conversation list.
Fixes #560

Tested manually, screenshots provided.

Tested on Linux 64-bit (Debian)

Attached, some screenshots of before and after behavior.
Before: even if only 3 items in the list, when the dropdown menu is shown the list shows a scrollbar (the list does not resize):
before

After: the scrollbar is not visible when not enough items are on the list and the dropdown menu is shown;
after

After: the vertical scrollbar works as expected and the horizontal one is no longer visible:
after2

@msgmaxim

This comment has been minimized.

Copy link
Collaborator

msgmaxim commented Nov 25, 2019

Looks good to me! Yeah, the DEVICE_MAPPING_ANNOTATION_KEY is fixed in #657.

Copy link
Collaborator

sachaaaaa left a comment

LGTM

ts/components/LeftPane.tsx Outdated Show resolved Hide resolved
@Bilb Bilb closed this Nov 26, 2019
@Bilb Bilb force-pushed the Bilb:clearnet branch from a18eba1 to 9733aee Nov 26, 2019
@Bilb Bilb self-assigned this Nov 26, 2019
@Bilb

This comment has been minimized.

Copy link
Collaborator Author

Bilb commented Nov 26, 2019

fixing lint

@Bilb Bilb reopened this Nov 26, 2019
@Mikunj
Mikunj approved these changes Nov 26, 2019
@msgmaxim msgmaxim merged commit 5a4ea93 into loki-project:clearnet Nov 26, 2019
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.