From ce6c3b5f85f4e460a5da00419461051b21b9483c Mon Sep 17 00:00:00 2001 From: Ashley Robinson Date: Fri, 6 Oct 2023 16:30:56 -0400 Subject: [PATCH 1/7] Updated styling for OsfDialog modal for mobile. --- .../components/osf-dialog/heading/styles.scss | 18 ++++++++++++++++++ .../components/osf-dialog/main/styles.scss | 6 ++++++ .../addon/components/osf-dialog/styles.scss | 1 + 3 files changed, 25 insertions(+) diff --git a/lib/osf-components/addon/components/osf-dialog/heading/styles.scss b/lib/osf-components/addon/components/osf-dialog/heading/styles.scss index 43ffb9281f0..7f6b4e081b7 100644 --- a/lib/osf-components/addon/components/osf-dialog/heading/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/heading/styles.scss @@ -18,3 +18,21 @@ align-self: flex-start; margin: 10px; } + + +@media (min-width: 501px) and (max-width: 991px) { + .HeadingWrapper { + h2 { + padding: 0.75rem 1rem 0.5rem; + } + + button { + display: flex; + margin-top: 20px; + } + } + + .CloseButton.CloseButton { + margin-top: 20px; + } +} diff --git a/lib/osf-components/addon/components/osf-dialog/main/styles.scss b/lib/osf-components/addon/components/osf-dialog/main/styles.scss index 8bbf6692da3..209029e991e 100644 --- a/lib/osf-components/addon/components/osf-dialog/main/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/main/styles.scss @@ -3,3 +3,9 @@ overflow: auto; padding: 1rem 1.25rem; } + +@media (min-width: 501px) and (max-width: 991px) { + .Main { + max-height: 50vh; + } +} diff --git a/lib/osf-components/addon/components/osf-dialog/styles.scss b/lib/osf-components/addon/components/osf-dialog/styles.scss index 3bc064887f5..fa0f19fe4bf 100644 --- a/lib/osf-components/addon/components/osf-dialog/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/styles.scss @@ -54,6 +54,7 @@ .Dialog { max-width: $width; + max-height: 55vh; } .Dialog.FixedWidth { From 59d642f831176fc9906cb8ccc69a4dd18deffd05 Mon Sep 17 00:00:00 2001 From: Ashley Robinson Date: Fri, 6 Oct 2023 17:19:27 -0400 Subject: [PATCH 2/7] Simplified styles for HeadingWrapper. --- .../addon/components/osf-dialog/heading/styles.scss | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/osf-components/addon/components/osf-dialog/heading/styles.scss b/lib/osf-components/addon/components/osf-dialog/heading/styles.scss index 7f6b4e081b7..832da098c80 100644 --- a/lib/osf-components/addon/components/osf-dialog/heading/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/heading/styles.scss @@ -21,18 +21,12 @@ @media (min-width: 501px) and (max-width: 991px) { - .HeadingWrapper { - h2 { - padding: 0.75rem 1rem 0.5rem; - } - - button { - display: flex; - margin-top: 20px; - } + .HeadingWrapper h2 { + padding: 0.75rem 1rem 0.5rem; } .CloseButton.CloseButton { + display: flex; margin-top: 20px; } } From 4f0173566e8d270e5eb6bf6d2e9e2adbb8bfd215 Mon Sep 17 00:00:00 2001 From: Ashley Robinson Date: Fri, 6 Oct 2023 17:53:51 -0400 Subject: [PATCH 3/7] Removed additional line in file. --- .../addon/components/osf-dialog/heading/styles.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/osf-components/addon/components/osf-dialog/heading/styles.scss b/lib/osf-components/addon/components/osf-dialog/heading/styles.scss index 832da098c80..81e2d3d718e 100644 --- a/lib/osf-components/addon/components/osf-dialog/heading/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/heading/styles.scss @@ -19,7 +19,6 @@ margin: 10px; } - @media (min-width: 501px) and (max-width: 991px) { .HeadingWrapper h2 { padding: 0.75rem 1rem 0.5rem; From f936adfdaead9c9b1121ca1a82e42d67617ebf61 Mon Sep 17 00:00:00 2001 From: Ashley Robinson Date: Mon, 9 Oct 2023 09:21:49 -0400 Subject: [PATCH 4/7] Removed unnecessary styling for modal. --- .../addon/components/osf-dialog/heading/styles.scss | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/osf-components/addon/components/osf-dialog/heading/styles.scss b/lib/osf-components/addon/components/osf-dialog/heading/styles.scss index 81e2d3d718e..43ffb9281f0 100644 --- a/lib/osf-components/addon/components/osf-dialog/heading/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/heading/styles.scss @@ -18,14 +18,3 @@ align-self: flex-start; margin: 10px; } - -@media (min-width: 501px) and (max-width: 991px) { - .HeadingWrapper h2 { - padding: 0.75rem 1rem 0.5rem; - } - - .CloseButton.CloseButton { - display: flex; - margin-top: 20px; - } -} From b90e695090fe050b16e1e5ec3722b12e44ebb08f Mon Sep 17 00:00:00 2001 From: Ashley Robinson Date: Mon, 9 Oct 2023 11:08:28 -0400 Subject: [PATCH 5/7] Updated z-index on dialog background to work regardless of screen height on desktop. --- lib/osf-components/addon/components/osf-dialog/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/osf-components/addon/components/osf-dialog/styles.scss b/lib/osf-components/addon/components/osf-dialog/styles.scss index fa0f19fe4bf..9e92801ba9d 100644 --- a/lib/osf-components/addon/components/osf-dialog/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/styles.scss @@ -11,7 +11,7 @@ align-items: center; justify-content: center; - z-index: 900; + z-index: 1100; background-color: rgba(0, 0, 0, 0.5); } From 9c55a3a1a5e276cba4aa3981c6effef0d2a1a50f Mon Sep 17 00:00:00 2001 From: Ashley Robinson Date: Mon, 9 Oct 2023 12:19:20 -0400 Subject: [PATCH 6/7] Updated fix for modal to overlap navbar by request. --- .../addon/components/osf-dialog/main/styles.scss | 6 ------ lib/osf-components/addon/components/osf-dialog/styles.scss | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/osf-components/addon/components/osf-dialog/main/styles.scss b/lib/osf-components/addon/components/osf-dialog/main/styles.scss index 209029e991e..8bbf6692da3 100644 --- a/lib/osf-components/addon/components/osf-dialog/main/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/main/styles.scss @@ -3,9 +3,3 @@ overflow: auto; padding: 1rem 1.25rem; } - -@media (min-width: 501px) and (max-width: 991px) { - .Main { - max-height: 50vh; - } -} diff --git a/lib/osf-components/addon/components/osf-dialog/styles.scss b/lib/osf-components/addon/components/osf-dialog/styles.scss index 9e92801ba9d..f7179c6c6c2 100644 --- a/lib/osf-components/addon/components/osf-dialog/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/styles.scss @@ -6,6 +6,7 @@ right: 0; padding-bottom: 10vh; + padding-top: 2rem; display: flex; align-items: center; @@ -54,7 +55,6 @@ .Dialog { max-width: $width; - max-height: 55vh; } .Dialog.FixedWidth { From eec336f29a5028509dff6d1eef648d0cd9fc77de Mon Sep 17 00:00:00 2001 From: Ashley Robinson Date: Mon, 9 Oct 2023 12:25:56 -0400 Subject: [PATCH 7/7] Updated padding statements to be inline. --- lib/osf-components/addon/components/osf-dialog/styles.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/osf-components/addon/components/osf-dialog/styles.scss b/lib/osf-components/addon/components/osf-dialog/styles.scss index f7179c6c6c2..bd6ad0cbb23 100644 --- a/lib/osf-components/addon/components/osf-dialog/styles.scss +++ b/lib/osf-components/addon/components/osf-dialog/styles.scss @@ -5,8 +5,7 @@ left: 0; right: 0; - padding-bottom: 10vh; - padding-top: 2rem; + padding: 2rem 0 10vh; display: flex; align-items: center;