From 95f83bcf2b046b8e59f404e2d56c4afcbf9371ee Mon Sep 17 00:00:00 2001
From: Chris Lawton <chris.lawton@torchbox.com>
Date: Fri, 11 Jan 2019 16:29:09 +0000
Subject: [PATCH] improve submissions grid column layout on wider screens and
correct variable typo
---
.../src/app/src/components/SubmissionsGrid/style.scss | 9 +++++++++
.../static_src/src/sass/apply/abstracts/_variables.scss | 1 +
.../static_src/src/sass/public/abstracts/_variables.scss | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/opentech/static_src/src/app/src/components/SubmissionsGrid/style.scss b/opentech/static_src/src/app/src/components/SubmissionsGrid/style.scss
index c6a059733..dc50e146f 100644
--- a/opentech/static_src/src/app/src/components/SubmissionsGrid/style.scss
+++ b/opentech/static_src/src/app/src/components/SubmissionsGrid/style.scss
@@ -1,6 +1,11 @@
.submissions-grid {
margin: 0 -20px;
+ // temporary to visualise middle column
+ > div:nth-child(2) {
+ background-color: white;
+ }
+
@include media-query(tablet-landscape) {
display: grid;
grid-template-columns: 28% 1fr 28%;
@@ -17,6 +22,10 @@
grid-template-columns: 20% 1fr 28%;
}
+ @include media-query(desktop-medium) {
+ grid-template-columns: 1fr 1280px 1fr;
+ }
+
&__header {
@include submission-list-item;
padding: 15px 20px;
diff --git a/opentech/static_src/src/sass/apply/abstracts/_variables.scss b/opentech/static_src/src/sass/apply/abstracts/_variables.scss
index d77a0c1bf..b18005a2a 100644
--- a/opentech/static_src/src/sass/apply/abstracts/_variables.scss
+++ b/opentech/static_src/src/sass/apply/abstracts/_variables.scss
@@ -97,6 +97,7 @@ $breakpoints: (
'tablet-landscape' '(min-width: 1024px)',
'laptop-short' '(min-width: 1024px) and (max-height: 1280px)',
'desktop' '(min-width: 1320px)',
+ 'desktop-medium' '(min-width: 1920px)',
'desktop-wide' '(min-width: 2556px)'
);
diff --git a/opentech/static_src/src/sass/public/abstracts/_variables.scss b/opentech/static_src/src/sass/public/abstracts/_variables.scss
index 8545b9184..e501e189b 100644
--- a/opentech/static_src/src/sass/public/abstracts/_variables.scss
+++ b/opentech/static_src/src/sass/public/abstracts/_variables.scss
@@ -92,7 +92,7 @@ $breakpoints: (
'tablet-portrait' '(min-width: 768px)',
'tablet-landscape' '(min-width: 1024px)',
'desktop' '(min-width: 1320px)',
- 'deskop-wide' '(min-width: 2556px)'
+ 'desktop-wide' '(min-width: 2556px)'
);
// Transition
--
GitLab