From bd7c40874d861916ca8e1e6fe8bd7ac735ca5560 Mon Sep 17 00:00:00 2001 From: Jimmy Sanford Date: Tue, 12 Jan 2021 16:17:53 -0700 Subject: [PATCH 1/4] Set fixed min-height on main page --- packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css | 1 - packages/venia-ui/lib/components/Main/main.css | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css b/packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css index 0d737a236f..e82c60c32f 100644 --- a/packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css +++ b/packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css @@ -1,6 +1,5 @@ .root { margin-left: 1rem; - margin-top: 1rem; font-size: 0.875rem; /* Permanent height to prevent pop-in. */ diff --git a/packages/venia-ui/lib/components/Main/main.css b/packages/venia-ui/lib/components/Main/main.css index 7f4924de6e..9ad849f0e3 100755 --- a/packages/venia-ui/lib/components/Main/main.css +++ b/packages/venia-ui/lib/components/Main/main.css @@ -12,7 +12,8 @@ .page { margin: 0 auto; max-width: var(--venia-global-maxWidth); - min-height: 100vh; + min-height: 40rem; + padding: 1rem 0 1.5rem; } .page_masked { From f31a96bedd58c409d1f61c4d15db087745f6aed1 Mon Sep 17 00:00:00 2001 From: Jimmy Sanford Date: Wed, 13 Jan 2021 16:01:26 -0700 Subject: [PATCH 2/4] Collapse margins without padding --- packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css | 1 + packages/venia-ui/lib/components/Main/main.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css b/packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css index e82c60c32f..0d737a236f 100644 --- a/packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css +++ b/packages/venia-ui/lib/components/Breadcrumbs/breadcrumbs.css @@ -1,5 +1,6 @@ .root { margin-left: 1rem; + margin-top: 1rem; font-size: 0.875rem; /* Permanent height to prevent pop-in. */ diff --git a/packages/venia-ui/lib/components/Main/main.css b/packages/venia-ui/lib/components/Main/main.css index 9ad849f0e3..ccb1049cd4 100755 --- a/packages/venia-ui/lib/components/Main/main.css +++ b/packages/venia-ui/lib/components/Main/main.css @@ -10,10 +10,10 @@ } .page { + display: grid; margin: 0 auto; max-width: var(--venia-global-maxWidth); min-height: 40rem; - padding: 1rem 0 1.5rem; } .page_masked { From 0c8b0b3cac30cfb79ef5e5421af92feadac46d9a Mon Sep 17 00:00:00 2001 From: Jimmy Sanford Date: Wed, 20 Jan 2021 13:51:36 -0700 Subject: [PATCH 3/4] Adjust min-height --- packages/venia-ui/lib/components/Main/main.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/venia-ui/lib/components/Main/main.css b/packages/venia-ui/lib/components/Main/main.css index ccb1049cd4..f495445de7 100755 --- a/packages/venia-ui/lib/components/Main/main.css +++ b/packages/venia-ui/lib/components/Main/main.css @@ -19,3 +19,21 @@ .page_masked { composes: page; } + +@media (min-height: 640px) { + .page { + min-height: 48rem; + } +} + +@media (min-height: 768px) { + .page { + min-height: 60rem; + } +} + +@media (min-height: 960px) { + .page { + min-height: 72rem; + } +} From b31fca976ad6c18fddd815551b27aaa5509f5e65 Mon Sep 17 00:00:00 2001 From: Jimmy Sanford Date: Mon, 25 Jan 2021 11:05:45 -0700 Subject: [PATCH 4/4] Revert grid to block --- packages/venia-ui/lib/components/Main/main.css | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/venia-ui/lib/components/Main/main.css b/packages/venia-ui/lib/components/Main/main.css index f495445de7..aea0fc72ee 100755 --- a/packages/venia-ui/lib/components/Main/main.css +++ b/packages/venia-ui/lib/components/Main/main.css @@ -10,7 +10,6 @@ } .page { - display: grid; margin: 0 auto; max-width: var(--venia-global-maxWidth); min-height: 40rem;