From 9b4405a182753b096b86930c42d4bc7be91f6c11 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Tue, 5 Mar 2019 19:06:28 +0000
Subject: [PATCH] Updates to make sure that the new scroll behaviour works on
small laptops
---
.../src/app/src/components/GroupedListing/styles.scss | 7 ++++++-
.../static_src/src/app/src/components/Listing/style.scss | 2 +-
.../src/app/src/components/SubmissionDisplay/styles.scss | 9 ++++++++-
.../static_src/src/app/src/components/Tabber/styles.scss | 8 +++++++-
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/opentech/static_src/src/app/src/components/GroupedListing/styles.scss b/opentech/static_src/src/app/src/components/GroupedListing/styles.scss
index a7721d242..7ca14912f 100644
--- a/opentech/static_src/src/app/src/components/GroupedListing/styles.scss
+++ b/opentech/static_src/src/app/src/components/GroupedListing/styles.scss
@@ -1,5 +1,10 @@
.grouped-listing {
- height: calc(100vh - var(--header-admin-height));
+ height: 98vh;
+
+ @include media-query(laptop-short) {
+ // allow for vertical scrolling on laptops
+ height: calc(100vh - var(--header-admin-height));
+ }
display: flex;
flex-direction: column;
diff --git a/opentech/static_src/src/app/src/components/Listing/style.scss b/opentech/static_src/src/app/src/components/Listing/style.scss
index 04c9dde7b..a55970b21 100644
--- a/opentech/static_src/src/app/src/components/Listing/style.scss
+++ b/opentech/static_src/src/app/src/components/Listing/style.scss
@@ -1,5 +1,5 @@
.listing {
- overflow-y: scroll;
+ overflow-y: overlay;
flex-grow: 3;
@include target-ie11 {
diff --git a/opentech/static_src/src/app/src/components/SubmissionDisplay/styles.scss b/opentech/static_src/src/app/src/components/SubmissionDisplay/styles.scss
index 7ad72c885..e9ed5475a 100644
--- a/opentech/static_src/src/app/src/components/SubmissionDisplay/styles.scss
+++ b/opentech/static_src/src/app/src/components/SubmissionDisplay/styles.scss
@@ -1,4 +1,11 @@
.application-display {
- @include column-scrolling;
+ height: calc(100vh - #{$listing-header-height});
+ overflow-y: scroll;
padding: 20px;
+
+ @include media-query(laptop-short) {
+ // allow for vertical scrolling on laptops
+ height: calc(100vh - var(--header-admin-height) - #{$listing-header-height});
+ }
+
}
diff --git a/opentech/static_src/src/app/src/components/Tabber/styles.scss b/opentech/static_src/src/app/src/components/Tabber/styles.scss
index 9eb77e036..52e8c5a1a 100644
--- a/opentech/static_src/src/app/src/components/Tabber/styles.scss
+++ b/opentech/static_src/src/app/src/components/Tabber/styles.scss
@@ -54,6 +54,12 @@
.tab {
display: flex;
flex-direction: column;
- height: calc(100vh - var(--header-admin-height) - #{$listing-header-height});
overflow-y: auto;
+ height: calc(100vh - #{$listing-header-height});
+
+ @include media-query(laptop-short) {
+ // allow for vertical scrolling on laptops
+ height: calc(100vh - var(--header-admin-height) - #{$listing-header-height});
+ }
+
}
--
GitLab