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

Fixes scrollbar displaying in channels screen without many items #1502

Merged
merged 2 commits into from
May 13, 2020
Merged

Fixes scrollbar displaying in channels screen without many items #1502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc30271
Fixes scrollbar always visible in Channels.vue
kelsos May 12, 2020
ae43b57
Updates CHANGELOG.md
kelsos May 12, 2020
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
5 changes: 5 additions & 0 deletions raiden-dapp/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
- [#1380] Allow the user to withdraw tokens from the Raiden Account.
- [#1371] Mint and deposit utility token to pay Monitoring Service.

### Fixed

- [#1490] Fixes scrollbar always showing up in channels screen.

[#1490]: https://github.com/raiden-network/light-client/issues/1490
[#1212]: https://github.com/raiden-network/light-client/issues/1212
[#1380]: https://github.com/raiden-network/light-client/issues/1380
[#1371]: https://github.com/raiden-network/light-client/issues/1371
Expand Down
7 changes: 3 additions & 4 deletions raiden-dapp/src/components/navigation/Channels.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ export default class Channels extends Mixins(NavigationMixin) {
.channels {
width: 100%;
height: 100%;
overflow-y: scroll;
@extend .themed-scrollbar;

&:first-child {
padding-top: 50px;
Expand All @@ -182,9 +180,10 @@ export default class Channels extends Mixins(NavigationMixin) {
}

&__wrapper {
height: 100%;
height: calc(100% - 60px);
width: 100%;
overflow-y: visible;
overflow-y: auto;
@extend .themed-scrollbar;
}

&__header {
Expand Down