From 32857cf791bc475bfa0124f0f5e79f355d5fc83f Mon Sep 17 00:00:00 2001 From: PHJoon Date: Wed, 13 Sep 2023 13:34:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Style]=20[GGFE-250]=20=EB=A7=A4=EB=89=B4?= =?UTF-8?q?=EC=96=BC=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/match/MatchManualModal.module.scss | 17 ++++++++++------ .../modal/store/StoreManualModal.module.scss | 20 ++++++++++++------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/styles/modal/match/MatchManualModal.module.scss b/styles/modal/match/MatchManualModal.module.scss index d7a28ef12..b5404d397 100644 --- a/styles/modal/match/MatchManualModal.module.scss +++ b/styles/modal/match/MatchManualModal.module.scss @@ -4,10 +4,13 @@ @include modalContainer('DARKPURPLE'); width: 80vw; max-width: 20rem; + justify-content: flex-start; + padding-top: 1.5rem; + padding-bottom: 1.5rem; } .title { - margin: 2.75rem 0; + margin-bottom: 1.5rem; font-family: 'Lexend'; font-size: 2.25rem; color: #f8f8ff; @@ -16,13 +19,13 @@ .matchRadioBoxWrap { box-sizing: border-box; - width: 100%; + width: 90%; } .ruleList { width: 100%; - height: 60vh; - max-height: 285px; + height: 50vh; + max-height: 50vh; padding: 1rem; margin: 0 0.6rem 1.75rem; overflow-y: scroll; @@ -30,8 +33,8 @@ font-weight: 700; color: black; list-style: none; - background: #ffffff; - border-radius: 0px 0px 10px 10px; + background: #fdebf8; + border-radius: 10px; > li { margin-top: 1.2rem; @@ -64,9 +67,11 @@ margin-left: 0.8rem; font-size: 0.9rem; font-weight: 400; + word-break: keep-all; > li { margin: 0.4rem 0; + line-height: 150%; white-space: pre-wrap; list-style: square; } diff --git a/styles/modal/store/StoreManualModal.module.scss b/styles/modal/store/StoreManualModal.module.scss index 5137a09d7..f73a0bbf8 100644 --- a/styles/modal/store/StoreManualModal.module.scss +++ b/styles/modal/store/StoreManualModal.module.scss @@ -4,10 +4,13 @@ @include modalContainer('DARKPURPLE'); width: 80vw; max-width: 20rem; + justify-content: flex-start; + padding-top: 1.5rem; + padding-bottom: 1.5rem; } .title { - margin: 2.75rem 0; + margin-bottom: 1.5rem; font-family: 'Lexend'; font-size: 2.25rem; color: #f8f8ff; @@ -21,8 +24,8 @@ .ruleList { width: 100%; - height: 60vh; - max-height: 285px; + height: 50vh; + max-height: 50vh; padding: 1rem; margin: 0 0.6rem 1.75rem; overflow-y: scroll; @@ -30,8 +33,8 @@ font-weight: 700; color: black; list-style: none; - background: #ffffff; - border-radius: 0px 0px 10px 10px; + background: #fdebf8; + border-radius: 10px; > li { margin-top: 1.2rem; @@ -41,8 +44,9 @@ .ruleTitle { display: flex; - align-items: center; + word-break: keep-all; vertical-align: middle; + align-items: center; &.withIcon { :first-child { min-width: 1.5rem; @@ -64,16 +68,18 @@ margin-left: 0.8rem; font-size: 0.9rem; font-weight: 400; + word-break: keep-all; > li { margin: 0.4rem 0; + line-height: 130%; white-space: pre-wrap; list-style: square; } .ruleContent { padding-left: 0.5rem; line-height: 170%; - list-style-type: '-'; + list-style-type: '- '; } } From 4fa03b85c81c8385d8c380ae576fe3654008a664 Mon Sep 17 00:00:00 2001 From: PHJoon Date: Thu, 14 Sep 2023 12:27:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Style]=20[GGFE-250]=20=ED=94=BC=EB=93=9C?= =?UTF-8?q?=EB=B0=B1=20=EB=B0=9B=EC=9D=80=20padding,=20margin,=20height=20?= =?UTF-8?q?=EA=B0=92=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/modal/match/MatchManualModal.module.scss | 9 ++++----- styles/modal/store/StoreManualModal.module.scss | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/styles/modal/match/MatchManualModal.module.scss b/styles/modal/match/MatchManualModal.module.scss index b5404d397..d9bf2707b 100644 --- a/styles/modal/match/MatchManualModal.module.scss +++ b/styles/modal/match/MatchManualModal.module.scss @@ -5,12 +5,12 @@ width: 80vw; max-width: 20rem; justify-content: flex-start; - padding-top: 1.5rem; - padding-bottom: 1.5rem; + padding-top: 2rem; + padding-bottom: 2rem; } .title { - margin-bottom: 1.5rem; + margin-bottom: 2rem; font-family: 'Lexend'; font-size: 2.25rem; color: #f8f8ff; @@ -24,8 +24,7 @@ .ruleList { width: 100%; - height: 50vh; - max-height: 50vh; + height: 45vh; padding: 1rem; margin: 0 0.6rem 1.75rem; overflow-y: scroll; diff --git a/styles/modal/store/StoreManualModal.module.scss b/styles/modal/store/StoreManualModal.module.scss index f73a0bbf8..1d2c3db4d 100644 --- a/styles/modal/store/StoreManualModal.module.scss +++ b/styles/modal/store/StoreManualModal.module.scss @@ -5,12 +5,12 @@ width: 80vw; max-width: 20rem; justify-content: flex-start; - padding-top: 1.5rem; - padding-bottom: 1.5rem; + padding-top: 2rem; + padding-bottom: 2rem; } .title { - margin-bottom: 1.5rem; + margin-bottom: 2rem; font-family: 'Lexend'; font-size: 2.25rem; color: #f8f8ff; @@ -24,8 +24,7 @@ .ruleList { width: 100%; - height: 50vh; - max-height: 50vh; + height: 45vh; padding: 1rem; margin: 0 0.6rem 1.75rem; overflow-y: scroll;