From 397461373862285eba166a60b72c8acd211f3ee4 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 8 Nov 2022 11:32:02 -0600 Subject: [PATCH] activities: fix not scrolling on overflow This adds css needed to make the activities tab view contents scroll appropriately when the contents don't fit vertically. Fixes: https://github.com/pybricks/support/issues/782 --- CHANGELOG.md | 2 ++ src/activities/activities.scss | 2 ++ src/explorer/explorer.scss | 7 +++++++ src/settings/settings.scss | 2 ++ 4 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b620101c..ad16b383 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,11 @@ ### Fixed - Fixed firmware checksum validation when checksum === 0. +- Fixed activity views not scrolling when contents don't fit ([support#782]). [pybricks-code#771]: https://github.com/pybricks/pybricks-code/issues/771 [support#719]: https://github.com/pybricks/support/issues/719 +[support#782]: https://github.com/pybricks/support/issues/782 ## [2.0.0-beta.9] - 2022-10-27 diff --git a/src/activities/activities.scss b/src/activities/activities.scss index b8908059..d9bbaa9d 100644 --- a/src/activities/activities.scss +++ b/src/activities/activities.scss @@ -26,6 +26,8 @@ } &-tabview { + display: flex; + flex-direction: column; width: bp.$pt-grid-size * 25; padding: bp.$pt-grid-size; @include pb.background-contrast(0%); diff --git a/src/explorer/explorer.scss b/src/explorer/explorer.scss index 6ca44dea..3bc3c71b 100644 --- a/src/explorer/explorer.scss +++ b/src/explorer/explorer.scss @@ -4,12 +4,19 @@ @use '@blueprintjs/core/lib/scss/variables' as bp; .pb-explorer { + min-height: 0; + flex: 1; + display: flex; + flex-direction: column; + &-header-toolbar { display: flex; justify-content: flex-end; } &-file-tree { + overflow-y: auto; + // don't need extra padding around toolbar & .#{bp.$ns}-tree-node-secondary-label { padding: unset; diff --git a/src/settings/settings.scss b/src/settings/settings.scss index ef51d96d..dbba0091 100644 --- a/src/settings/settings.scss +++ b/src/settings/settings.scss @@ -6,6 +6,8 @@ @use '@blueprintjs/core/lib/scss/variables' as bp; .pb-settings { + overflow-y: auto; + .#{bp.$ns}-control-group { .#{bp.$ns}-button { margin-bottom: 3px;