Skip to content

Commit

Permalink
Merge pull request #543 from Team-WeQuiz/feat/#542
Browse files Browse the repository at this point in the history
[FE] νŠœν† λ¦¬μ–Ό μŠ€νƒ€μΌ μˆ˜μ •
  • Loading branch information
ryanbae94 authored May 30, 2024
2 parents 1ec50d8 + ddbbf05 commit b69ffff
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 14 deletions.
46 changes: 45 additions & 1 deletion chatty-fe/src/app/_components/Header/Header.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,13 @@ export const musicPlayButton = style({
export const ModalContainer = style({
width: '60vw',
maxWidth: 890,
height: '80vh',
height: '100%',
'@media': {
'(max-width: 768px)': {
width: '100%',
height: '100%',
},
},
});

export const LogoWrapper = style({});
Expand Down Expand Up @@ -112,6 +118,13 @@ export const ContentsBox = style({
boxShadow: '0px 4px 8px rgba(0, 0, 0, 0.1)',
color: '#fff',
transition: 'background-color 0.3s',
'@media': {
'(max-width: 768px)': {
width: '100%',
height: 32,
minHeight: 32,
},
},
});

export const ContentsWrapper = recipe({
Expand All @@ -123,6 +136,11 @@ export const ContentsWrapper = recipe({
justifyContent: 'center',
gap: 24,
margin: '12px 0',
'@media': {
'(max-width: 768px)': {
width: '100%',
},
},
},
variants: {
visible: {
Expand All @@ -143,6 +161,11 @@ export const ImageWrapper = style({
alignItems: 'center',
width: '100%',
height: 300,
'@media': {
'(max-width: 768px)': {
height: 150,
},
},
});

export const ContentsTextWrapper = style({
Expand All @@ -154,3 +177,24 @@ export const ContentsTextWrapper = style({
gap: 12,
wordBreak: 'keep-all',
});

export const BoldText = style({
fontSize: '1rem',
fontWeight: '700',
'@media': {
'(max-width: 768px)': {
fontSize: '0.8rem',
},
},
});

export const ContentsText = style({
fontSize: '1rem',
fontWeight: '400',
color: globals.color.black_2,
'@media': {
'(max-width: 768px)': {
fontSize: '0.8rem',
},
},
});
28 changes: 15 additions & 13 deletions chatty-fe/src/app/_components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,15 @@ export default function Header() {
/>
</div>
<div className={styles.ContentsTextWrapper}>
<p>
<span style={{ fontWeight: 700 }}>λ°© 제λͺ©</span>,{' '}
<span style={{ fontWeight: 700 }}>μ„€λͺ…</span>,{' '}
<span style={{ fontWeight: 700 }}>인원 수</span>,{' '}
<span style={{ fontWeight: 700 }}>문제 수</span>λ₯Ό μ„€μ •ν•˜μ„Έμš”.
<p className={styles.ContentsText}>
<span className={styles.BoldText}>λ°© 제λͺ©</span>,{' '}
<span className={styles.BoldText}>μ„€λͺ…</span>,{' '}
<span className={styles.BoldText}>인원 수</span>,{' '}
<span className={styles.BoldText}>문제 수</span>λ₯Ό μ„€μ •ν•˜μ„Έμš”.
</p>
<p className={styles.ContentsText}>
λ‹‰λ„€μž„μ„ μž…λ ₯ν•˜λ©΄, ν€΄μ¦ˆ 방이 μƒμ„±λ©λ‹ˆλ‹€!
</p>
<p>λ‹‰λ„€μž„μ„ μž…λ ₯ν•˜λ©΄, ν€΄μ¦ˆ 방이 μƒμ„±λ©λ‹ˆλ‹€!</p>
</div>
</div>
<div className={styles.ContentsBox} onClick={handlePlayVisibility}>
Expand All @@ -192,14 +194,14 @@ export default function Header() {
/>
</div>
<div className={styles.ContentsTextWrapper}>
<p>
<span style={{ fontWeight: 700 }}>μ—”ν„° ν‚€</span> λ‘œλ„ 닡을
<p className={styles.ContentsText}>
<span className={styles.BoldText}>μ—”ν„° ν‚€</span> λ‘œλ„ 닡을
μ œμΆœν•  수 μžˆμŠ΅λ‹ˆλ‹€.
</p>

<p>
<span style={{ fontWeight: 700 }}>과반수</span> 이상이 닡을
μž…λ ₯ν•˜λ©΄ <span style={{ fontWeight: 700 }}>3초</span> 뒀에
<p className={styles.ContentsText}>
<span className={styles.BoldText}>과반수</span> 이상이 닡을
μž…λ ₯ν•˜λ©΄ <span className={styles.BoldText}>3초</span> 뒀에
μžλ™μœΌλ‘œ λ‹€μŒ 문제둜 λ„˜μ–΄κ°‘λ‹ˆλ‹€!
</p>
</div>
Expand All @@ -225,8 +227,8 @@ export default function Header() {
/>
</div>
<div className={styles.ContentsTextWrapper}>
<p>
<span style={{ fontWeight: 700 }}>λ§ˆμ΄νŽ˜μ΄μ§€</span> μ—μ„œ λ‚΄κ°€
<p className={styles.ContentsText}>
<span className={styles.BoldText}>λ§ˆμ΄νŽ˜μ΄μ§€</span> μ—μ„œ λ‚΄κ°€
ν’€μ—ˆλ˜ ν€΄μ¦ˆμ˜ κ²°κ³Όλ₯Ό μ–Έμ œλ“ μ§€ 확인할 수 μžˆμŠ΅λ‹ˆλ‹€.
</p>
</div>
Expand Down

0 comments on commit b69ffff

Please sign in to comment.