Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GGFE-250] 매뉴얼 스타일 수정 #1008

Merged
merged 3 commits into from
Sep 14, 2023
Merged

[GGFE-250] 매뉴얼 스타일 수정 #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32857cf
[Style] [GGFE-250] 매뉴얼 스타일 수정
PHJoon Sep 13, 2023
4fa03b8
[Style] [GGFE-250] 피드백 받은 padding, margin, height 값 조정
PHJoon Sep 14, 2023
771ed76
Merge branch 'main' into GGFE-250-매뉴얼-스타일-수정
PHJoon Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions styles/modal/match/MatchManualModal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
@include modalContainer('DARKPURPLE');
width: 80vw;
max-width: 20rem;
justify-content: flex-start;
padding-top: 2rem;
padding-bottom: 2rem;
}

.title {
margin: 2.75rem 0;
margin-bottom: 2rem;
font-family: 'Lexend';
font-size: 2.25rem;
color: #f8f8ff;
Expand All @@ -16,22 +19,21 @@

.matchRadioBoxWrap {
box-sizing: border-box;
width: 100%;
width: 90%;
}

.ruleList {
width: 100%;
height: 60vh;
max-height: 285px;
height: 45vh;
padding: 1rem;
margin: 0 0.6rem 1.75rem;
overflow-y: scroll;
font-size: 1.2rem;
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;
Expand Down Expand Up @@ -64,9 +66,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;
}
Expand Down
19 changes: 12 additions & 7 deletions styles/modal/store/StoreManualModal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
@include modalContainer('DARKPURPLE');
width: 80vw;
max-width: 20rem;
justify-content: flex-start;
padding-top: 2rem;
padding-bottom: 2rem;
}

.title {
margin: 2.75rem 0;
margin-bottom: 2rem;
font-family: 'Lexend';
font-size: 2.25rem;
color: #f8f8ff;
Expand All @@ -21,17 +24,16 @@

.ruleList {
width: 100%;
height: 60vh;
max-height: 285px;
height: 45vh;
padding: 1rem;
margin: 0 0.6rem 1.75rem;
overflow-y: scroll;
font-size: 1.2rem;
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;
Expand All @@ -41,8 +43,9 @@

.ruleTitle {
display: flex;
align-items: center;
word-break: keep-all;
vertical-align: middle;
align-items: center;
&.withIcon {
:first-child {
min-width: 1.5rem;
Expand All @@ -64,16 +67,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: '- ';
}
}

Expand Down