From de6a31a088a65d2d2d98770bb4144f5b84032c5b Mon Sep 17 00:00:00 2001
From: Chris Lawton <chris.lawton@torchbox.com>
Date: Wed, 6 Mar 2019 10:01:40 +0000
Subject: [PATCH] allow for scrolling on laptop but not desktops
---
.../app/src/components/GroupedListing/styles.scss | 12 +++++++-----
.../app/src/components/SubmissionDisplay/styles.scss | 8 +++++---
.../src/app/src/components/Tabber/styles.scss | 6 ++++--
3 files changed, 16 insertions(+), 10 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 7ca14912f..db881d048 100644
--- a/opentech/static_src/src/app/src/components/GroupedListing/styles.scss
+++ b/opentech/static_src/src/app/src/components/GroupedListing/styles.scss
@@ -1,13 +1,15 @@
.grouped-listing {
- height: 98vh;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
- @include media-query(laptop-short) {
- // allow for vertical scrolling on laptops
+ @include media-query(tablet-landscape) {
height: calc(100vh - var(--header-admin-height));
}
- display: flex;
- flex-direction: column;
+ @include media-query(laptop-short) {
+ height: 100vh;
+ }
&__dropdown {
@include submission-list-item;
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 e9ed5475a..fd9cee434 100644
--- a/opentech/static_src/src/app/src/components/SubmissionDisplay/styles.scss
+++ b/opentech/static_src/src/app/src/components/SubmissionDisplay/styles.scss
@@ -1,11 +1,13 @@
.application-display {
- height: calc(100vh - #{$listing-header-height});
+ height: 100vh;
overflow-y: scroll;
padding: 20px;
- @include media-query(laptop-short) {
- // allow for vertical scrolling on laptops
+ @include media-query(tablet-landscape) {
height: calc(100vh - var(--header-admin-height) - #{$listing-header-height});
}
+ @include media-query(laptop-short) {
+ height: calc(100vh - #{$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 52e8c5a1a..bbb0652a7 100644
--- a/opentech/static_src/src/app/src/components/Tabber/styles.scss
+++ b/opentech/static_src/src/app/src/components/Tabber/styles.scss
@@ -57,9 +57,11 @@
overflow-y: auto;
height: calc(100vh - #{$listing-header-height});
- @include media-query(laptop-short) {
- // allow for vertical scrolling on laptops
+ @include media-query(tablet-landscape) {
height: calc(100vh - var(--header-admin-height) - #{$listing-header-height});
}
+ @include media-query(laptop-short) {
+ height: calc(100vh - #{$listing-header-height});
+ }
}
--
GitLab