Skip to content

Commit

Permalink
Merge pull request #1408 from 42organization/6th_party
Browse files Browse the repository at this point in the history
[test-deploy] 파티모집 최종본 빌드 오류 수정 후 테스트 재배포
  • Loading branch information
izone00 authored Apr 16, 2024
2 parents f06b188 + 3f74433 commit 47ffde9
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 9 deletions.
101 changes: 101 additions & 0 deletions styles/modal/party/PartyManualModal.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
@import 'styles/common.scss';
@import 'styles/party/PartyCommon.scss';

.container {
@include modalContainer('DARKPURPLE');
width: 80vw;
max-width: 20rem;
justify-content: flex-start;
padding-top: 2rem;
padding-bottom: 2rem;
background: $party-gradient1;
}

.title {
@include modalTitle; // font-family, font-size, font-weight, letter-spacing
margin-bottom: 2rem;
font-size: 2.25rem;
color: #f8f8ff;
text-shadow: 0px 0px 12px #ffffff;
}

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

.ruleList {
width: 100%;
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: $party-blue-sky5;
border-radius: 10px;

> li {
margin-top: 1.2rem;
margin-bottom: 1rem;
}
}

.ruleTitle {
display: flex;
align-items: center;
vertical-align: middle;
&.withIcon {
:first-child {
min-width: 1.5rem;
max-width: 1.5rem;
min-height: 1.5rem;
max-height: 1.5rem;
}
:last-child {
margin-left: 0.5rem;
}
}
&.withoutIcon {
margin-left: 0.5rem;
}
}

.ruleDetail {
padding: 0.5rem 0.5em 0.5rem 1.5rem;
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;
}
}

.ruleList::-webkit-scrollbar {
display: inherit;
width: 6px;
height: 1rem;
}

.ruleList::-webkit-scrollbar-thumb {
background: #c6c4c4;
border-radius: 6px;
}

.closeButton {
width: 8rem;
height: 2.5rem;
padding: 0.75rem 3.1rem;
font-size: 0.9rem;
color: rgba(255, 255, 255, 1);
background: $party-gradient0;
border: 0;
border-radius: 0.625rem;
}
8 changes: 1 addition & 7 deletions styles/party/PartyCreate.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,14 @@
header {
display: flex;
align-items: center;
justify-content: space-between;
justify-content: center;
margin-bottom: 1em;

h2 {
margin: 0;
font-size: $giant-font;
letter-spacing: 1px;
}
button {
padding: 0;
color: $white1;
background-color: inherit;
border-style: none;
}
}
input,
select,
Expand Down
9 changes: 9 additions & 0 deletions styles/party/PartyMain.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@
border-style: none;
border-radius: 1em;
}
.guideButton {
padding: 0.3em 0.6em;
margin-right: 0.5em;
font-size: $medium-font;
color: white;
background: $party-gradient3;
border-style: none;
border-radius: 1em;
}
.penalty {
padding: 0.3em 0.6em;
font-size: $medium-font;
Expand Down
4 changes: 2 additions & 2 deletions types/modalTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type StoreModal = 'MANUAL' | 'COIN_HISTORY';

type TournamentModal = 'REGISTRY' | 'MANUAL';

type PartyModal = 'REPORT';
export type PartyModal = 'REPORT' | 'MANUAL';

type AdminModal =
| 'PROFILE'
Expand All @@ -63,7 +63,7 @@ type AdminModal =
| 'PARTY_EDIT'
| 'RECRUIT_MESSAGE_TEMPLATE';

type ModalName =
export type ModalName =
| null
| `EVENT-${EventModal}`
| `MENU-${MenuModal}`
Expand Down

0 comments on commit 47ffde9

Please sign in to comment.