Skip to content

Commit e5f41ac

Browse files
authored
Merge pull request #100 from Team-INSERT/fix/chore
Fix/chore
2 parents 9882058 + e9b6fa5 commit e5f41ac

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/hooks/useMeisterHTML.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,19 @@ export const useMeisterHTML = () => {
123123
.replaceAll("`", "")
124124
.replaceAll(
125125
"(상점 : ",
126-
`\n<span style="font-size: 24px !important; font-weight: 600 !important;">상점 `,
126+
`\n<span style="font-size: 20px !important; font-weight: 600 !important;">상점 `,
127127
)
128128
.replaceAll(
129129
"(벌점 : ",
130-
`\n<span style="font-size: 24px !important; font-weight: 600 !important;">벌점 `,
130+
`\n<span style="font-size: 20px !important; font-weight: 600 !important;">벌점 `,
131131
)
132132
.replaceAll("점)", "점</span>")
133133
.replaceAll("부여일 : ", "20")
134134
.replace(/\d{2}-/gi, "")
135135
.replace(/\d{2}-/gi, "")
136136
.replace(/\d{2}-/gi, "")
137-
.replace(/\(([^)]*[^)]*)\)/g, "$1")
138-
.replace(/·/gi, "asdfasfsf");
137+
.replace(/\(([^)]*[^)]*)\)/gi, "$1")
138+
.replace(/\([^)]*\)/gi, "");
139139
};
140140

141141
return { getBasicJobSkills, scoreParser, pointParser };

src/templates/home/layouts/HomeCalender.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { color, flex, font } from "@/styles";
22
import { CalenderIcon } from "@/assets/icons";
3+
import getPlanType from "@/helpers/getPlanType.helper";
34
import React from "react";
45
import styled from "styled-components";
56
import HomeHead from "./HomeHead";
@@ -19,7 +20,7 @@ const HomeCalender = ({ calenders }: IHomeCalenderProps) => {
1920
<CalenderBody>
2021
{calenders.map((calender) => (
2122
<CalenderContent>
22-
- {calender.title} ({calender.type})
23+
- {calender.title} <span>{getPlanType(calender.type)}</span>
2324
</CalenderContent>
2425
))}
2526
</CalenderBody>
@@ -43,10 +44,15 @@ const CalenderBody = styled.div`
4344
`;
4445

4546
const CalenderContent = styled.p`
46-
${font.p3};
47+
${font.p2};
4748
padding-left: 6px;
4849
white-space: pre;
4950
line-height: 160%;
51+
52+
span {
53+
${font.p4};
54+
color: ${color.gray};
55+
}
5056
`;
5157

5258
export default HomeCalender;

src/templates/meister/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ const PointHTMLContent = styled.div`
369369
}
370370
371371
li > div > div {
372-
font-size: 20px !important;
372+
font-size: 16px !important;
373373
font-weight: 500 !important;
374374
text-align: center !important;
375375
white-space: pre-wrap !important;
@@ -378,7 +378,7 @@ const PointHTMLContent = styled.div`
378378
}
379379
380380
li > div > div:first-child > div {
381-
font-size: 20px !important;
381+
font-size: 18px !important;
382382
font-weight: 500 !important;
383383
color: black !important;
384384
}

0 commit comments

Comments
 (0)