Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/components/education/FlippableCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ const CardHeader = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
font-size: 1rem;
font-size: 24px;
color: #6c757d;
height: 4rem;
height: 100px;
`;

const CardDescriptionContainer = styled.div`
Expand All @@ -69,8 +69,8 @@ const CardCategory = styled.span`
const CardDifficulty = styled.span``;

const CardTitle = styled.div`
font-size: 1.5rem;
font-weight: bold;
font-size: 30px;
font-weight: 700;
text-align: center;
margin: auto 0;
color: #343a40;
Expand All @@ -90,15 +90,15 @@ const ActionButton = styled.button`
`;

const InfoTitle = styled.div`
font-weight: bold;
font-size: 1.5rem;
font-weight: 700;
font-size: 20px;
color: #495057;
margin-bottom: 5px;
height: 2rem;
`;

const CardText = styled.div`
font-size: 1rem;
font-size: 20px;
color: #212529;
margin-bottom: 15px;
line-height: 1.6;
Expand Down
23 changes: 13 additions & 10 deletions src/pages/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ const UserNicknameText = styled.p`
`;

const UserCharacterNameText = styled.p`
font-size: 16px;
font-size: 20px;
color: ${GGAMJA_COLOR.LIGHT_BROWN};
margin-top: 8px;

line-height: 1.5;
`;

Expand All @@ -148,20 +148,20 @@ const UserStatusContentWrapper = styled.div`
`;

const UserLevelContentTitle = styled.p`
font-size: 16px;
font-size: 20px;
color: ${GGAMJA_COLOR.LIGHT_BROWN};
margin: 0;
padding: 0 0 20px 0;
line-height: 1.5;
text-align: center;
display: flex;
justify-content: space-evenly;
align-items: center;
width: 100%;
`;

const UserStatusContentTitle = styled.p`
font-size: 16px;
font-size: 20px;
color: ${GGAMJA_COLOR.LIGHT_BROWN};
line-height: 1.5;
padding: 10px 0 10px 0;
padding: 0 0 10px 0;
margin: 0;
`;

Expand Down Expand Up @@ -279,9 +279,12 @@ const HomePage = () => {
</GrassBackgroundWrapper>
</UserCharacterWrapper>
<UserNicknameText>이름 : {nickname}</UserNicknameText>
<UserCharacterNameText>{characterName}</UserCharacterNameText>

<UserStatusContentWrapper>
<UserLevelContentTitle>레벨 {level}</UserLevelContentTitle>
<UserLevelContentTitle>
레벨 {level}
<UserCharacterNameText>{characterName}</UserCharacterNameText>
</UserLevelContentTitle>
<UserStatusContentTitle>현재 경험치</UserStatusContentTitle>
<UserStatusContentTitle>
{points} / {endPoint}
Expand Down