From f682aef24c4e83953b6795905eac4242de002ea5 Mon Sep 17 00:00:00 2001 From: ww2497 Date: Fri, 25 Sep 2020 23:14:20 -0400 Subject: [PATCH 1/5] Content is now ~centered on tablet --- src/index.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/index.scss b/src/index.scss index 92c114929..f60218d70 100644 --- a/src/index.scss +++ b/src/index.scss @@ -185,7 +185,7 @@ html, body, #root, #app, .full-height { @include tablet { max-width: 100%; flex-direction: column; - margin: 0px; + margin: auto; } } @@ -195,6 +195,10 @@ html, body, #root, #app, .full-height { .left-half { @extend .right-half; margin-bottom: 2.5vh; + + @include tablet { + margin-bottom: 20vh; + } } .hero-img { From 747db6caba8a7c967396c5e0fd4b789e8f9f5534 Mon Sep 17 00:00:00 2001 From: ww2497 Date: Fri, 25 Sep 2020 23:44:15 -0400 Subject: [PATCH 2/5] Shifted extra mobile section height to tablet --- src/index.scss | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/index.scss b/src/index.scss index f60218d70..7fc3c7b0f 100644 --- a/src/index.scss +++ b/src/index.scss @@ -14,6 +14,9 @@ $mobile-width: 750px; @mixin desktop { @media(min-width: #{$desktop-width}) { @content; } } +@mixin tablet-only { + @media(max-width: #{$desktop-width}) { @media(min-width: #{$mobile-width}) {@content; } } +} /*tablet mixin also applies to mobile*/ @mixin tablet { @media(max-width: #{$desktop-width}) { @content; } @@ -167,11 +170,13 @@ html, body, #root, #app, .full-height { } .section { - height: 100%; display: flex; flex-direction: column; @include desktop { - min-height: 775px; + min-height: 750px; + } + @include tablet-only { + height: calc(100% - 74.5px); } } @@ -196,7 +201,7 @@ html, body, #root, #app, .full-height { @extend .right-half; margin-bottom: 2.5vh; - @include tablet { + @include tablet-only { margin-bottom: 20vh; } } From d22baf502d5c68dda973a62becd0e330bf60c441 Mon Sep 17 00:00:00 2001 From: ww2497 Date: Fri, 25 Sep 2020 23:48:46 -0400 Subject: [PATCH 3/5] Removed extra tablet section height --- src/index.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/index.scss b/src/index.scss index 7fc3c7b0f..689cee91d 100644 --- a/src/index.scss +++ b/src/index.scss @@ -14,9 +14,6 @@ $mobile-width: 750px; @mixin desktop { @media(min-width: #{$desktop-width}) { @content; } } -@mixin tablet-only { - @media(max-width: #{$desktop-width}) { @media(min-width: #{$mobile-width}) {@content; } } -} /*tablet mixin also applies to mobile*/ @mixin tablet { @media(max-width: #{$desktop-width}) { @content; } @@ -172,12 +169,17 @@ html, body, #root, #app, .full-height { .section { display: flex; flex-direction: column; + height: 100%; + @include desktop { min-height: 750px; } - @include tablet-only { + @include tablet { height: calc(100% - 74.5px); } + @include mobile { + height: 0%; + } } .content { @@ -201,7 +203,7 @@ html, body, #root, #app, .full-height { @extend .right-half; margin-bottom: 2.5vh; - @include tablet-only { + @include tablet { margin-bottom: 20vh; } } From a42edb448ac8ee886f48f5ea45315e9039fb0b57 Mon Sep 17 00:00:00 2001 From: ww2497 Date: Fri, 25 Sep 2020 23:50:48 -0400 Subject: [PATCH 4/5] Further adjusted tablet margins --- src/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.scss b/src/index.scss index 689cee91d..7c57acf2a 100644 --- a/src/index.scss +++ b/src/index.scss @@ -204,7 +204,7 @@ html, body, #root, #app, .full-height { margin-bottom: 2.5vh; @include tablet { - margin-bottom: 20vh; + margin-bottom: 15vh; } } From b90e2436098377a9bb55af5f7ad244fde9ae1f34 Mon Sep 17 00:00:00 2001 From: ww2497 Date: Fri, 25 Sep 2020 23:54:37 -0400 Subject: [PATCH 5/5] Re-ordered a single line --- src/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.scss b/src/index.scss index 7c57acf2a..896fed7bb 100644 --- a/src/index.scss +++ b/src/index.scss @@ -167,9 +167,9 @@ html, body, #root, #app, .full-height { } .section { + height: 100%; display: flex; flex-direction: column; - height: 100%; @include desktop { min-height: 750px;