File tree Expand file tree Collapse file tree 3 files changed +14
-8
lines changed Expand file tree Collapse file tree 3 files changed +14
-8
lines changed Original file line number Diff line number Diff line change @@ -123,19 +123,19 @@ export const useMeisterHTML = () => {
123
123
. replaceAll ( "`" , "" )
124
124
. replaceAll (
125
125
"(상점 : " ,
126
- `\n<span style="font-size: 24px !important; font-weight: 600 !important;">상점 ` ,
126
+ `\n<span style="font-size: 20px !important; font-weight: 600 !important;">상점 ` ,
127
127
)
128
128
. replaceAll (
129
129
"(벌점 : " ,
130
- `\n<span style="font-size: 24px !important; font-weight: 600 !important;">벌점 ` ,
130
+ `\n<span style="font-size: 20px !important; font-weight: 600 !important;">벌점 ` ,
131
131
)
132
132
. replaceAll ( "점)" , "점</span>" )
133
133
. replaceAll ( "부여일 : " , "20" )
134
134
. replace ( / 상 \d { 2 } - / gi, "" )
135
135
. replace ( / 기 숙 사 \d { 2 } - / gi, "" )
136
136
. replace ( / 학 교 \d { 2 } - / gi, "" )
137
- . replace ( / \( ( [ ^ ) ] * 선 생 님 [ ^ ) ] * ) \) / g , "$1" )
138
- . replace ( / · / gi, "asdfasfsf " ) ;
137
+ . replace ( / \( ( [ ^ ) ] * 선 생 님 [ ^ ) ] * ) \) / gi , "$1" )
138
+ . replace ( / \( [ ^ ) ] * \) / gi, "" ) ;
139
139
} ;
140
140
141
141
return { getBasicJobSkills, scoreParser, pointParser } ;
Original file line number Diff line number Diff line change 1
1
import { color , flex , font } from "@/styles" ;
2
2
import { CalenderIcon } from "@/assets/icons" ;
3
+ import getPlanType from "@/helpers/getPlanType.helper" ;
3
4
import React from "react" ;
4
5
import styled from "styled-components" ;
5
6
import HomeHead from "./HomeHead" ;
@@ -19,7 +20,7 @@ const HomeCalender = ({ calenders }: IHomeCalenderProps) => {
19
20
< CalenderBody >
20
21
{ calenders . map ( ( calender ) => (
21
22
< CalenderContent >
22
- - { calender . title } ( { calender . type } )
23
+ - { calender . title } < span > { getPlanType ( calender . type ) } </ span >
23
24
</ CalenderContent >
24
25
) ) }
25
26
</ CalenderBody >
@@ -43,10 +44,15 @@ const CalenderBody = styled.div`
43
44
` ;
44
45
45
46
const CalenderContent = styled . p `
46
- ${ font . p3 } ;
47
+ ${ font . p2 } ;
47
48
padding-left: 6px;
48
49
white-space: pre;
49
50
line-height: 160%;
51
+
52
+ span {
53
+ ${ font . p4 } ;
54
+ color: ${ color . gray } ;
55
+ }
50
56
` ;
51
57
52
58
export default HomeCalender ;
Original file line number Diff line number Diff line change @@ -369,7 +369,7 @@ const PointHTMLContent = styled.div`
369
369
}
370
370
371
371
li > div > div {
372
- font-size: 20px !important;
372
+ font-size: 16px !important;
373
373
font-weight: 500 !important;
374
374
text-align: center !important;
375
375
white-space: pre-wrap !important;
@@ -378,7 +378,7 @@ const PointHTMLContent = styled.div`
378
378
}
379
379
380
380
li > div > div:first-child > div {
381
- font-size: 20px !important;
381
+ font-size: 18px !important;
382
382
font-weight: 500 !important;
383
383
color: black !important;
384
384
}
You can’t perform that action at this time.
0 commit comments