Skip to content

Commit a644a32

Browse files
authored
๐ŸŽจ style: Modal ์ปดํฌ๋„ŒํŠธ์— ํฐํŠธ ํด๋ž˜์Šค ์ถ”๊ฐ€ ๋ฐ ์ ์šฉ
๐ŸŽจ style: Modal ์ปดํฌ๋„ŒํŠธ์— ํฐํŠธ ํด๋ž˜์Šค ์ถ”๊ฐ€ ๋ฐ ์ ์šฉ
2 parents 0b38726 + 0102281 commit a644a32

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

โ€Žsrc/components/Card/Card.jsxโ€Ž

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ import plus from '../../assets/images/plus.svg';
55
import Badge from '../Badge/Badge';
66
import styles from './Card.module.scss';
77

8-
const fontFamilyMap = {
9-
'Noto Sans': '"Noto Sans", sans-serif',
10-
Pretendard: '"Pretendard", sans-serif',
11-
๋‚˜๋ˆ”๋ช…์กฐ: '"Nanum Myeongjo", serif',
12-
'๋‚˜๋ˆ”์†๊ธ€์”จ ์†ํŽธ์ง€์ฒด': '"Nanum Sonpyeonji Ce", cursive',
13-
};
14-
158
export default function Card({
169
id,
1710
image,

โ€Žsrc/components/Modal/Modal.jsxโ€Ž

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ import Badge from '../Badge/Badge';
55
import Button from '../common/Button';
66
import styles from './Modal.module.scss';
77

8-
const fontFamilyMap = {
9-
'Noto Sans': '"Noto Sans", sans-serif',
10-
Pretendard: '"Pretendard", sans-serif',
11-
๋‚˜๋ˆ”๋ช…์กฐ: '"Nanum Myeongjo", serif',
12-
'๋‚˜๋ˆ”์†๊ธ€์”จ ์†ํŽธ์ง€์ฒด': '"Nanum Sonpyeonji Ce", cursive',
13-
};
14-
158
export default function Modal({
169
image,
1710
sender,
@@ -53,7 +46,7 @@ export default function Modal({
5346
<div className={styles['modal__body']}>
5447
<div className={styles['modal__content']}>
5548
<div
56-
style={{ fontFamily: fontFamilyMap[font] }}
49+
className={`${styles['modal__content']} font-${font.replace(/\s/g, '')}`}
5750
dangerouslySetInnerHTML={{ __html: sanitizedHTML }}
5851
/>
5952
</div>

โ€Žsrc/components/Modal/Modal.module.scssโ€Ž

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,19 @@
142142
width: calc(100% - 48px);
143143
}
144144
}
145+
146+
:global(.font-๋‚˜๋ˆ”๋ช…์กฐ) {
147+
font-family: '๋‚˜๋ˆ”๋ช…์กฐ', serif;
148+
}
149+
150+
:global(.font-๋‚˜๋ˆ”์†๊ธ€์”จ์†ํŽธ์ง€์ฒด) {
151+
font-family: '๋‚˜๋ˆ”์†๊ธ€์”จ ์†ํŽธ์ง€์ฒด', cursive;
152+
}
153+
154+
:global(.font-Pretendard) {
155+
font-family: 'Pretendard', sans-serif;
156+
}
157+
158+
:global(.font-NotoSans) {
159+
font-family: 'Noto Sans', sans-serif;
160+
}

โ€Žsrc/pages/Recipient/Recipient.module.scssโ€Ž

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@
5757
border: none;
5858
cursor: pointer;
5959
color: $white;
60-
transition: transform 0.3s ease;
60+
transition:
61+
color 0.3s ease,
62+
transform 0.3s ease;
6163
@include font-18-bold;
6264

6365
&:hover {
66+
color: $black;
6467
animation: shake 0.5s ease;
6568
animation-iteration-count: 1;
6669
}

0 commit comments

Comments
ย (0)