Skip to content

보관함 디자인 수정 #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ProblmZro wants to merge 5 commits into
base: main
Choose a base branch
from
Open

보관함 디자인 수정 #290

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69bdc77
refactor: 모달창 글씨체 수정
ProblmZro May 18, 2024
c6b917e
refactor: 보관함 받은 날짜 계산 수정
ProblmZro May 18, 2024
655e5ea
refactor: 보관함 기도 간격 수정
ProblmZro May 18, 2024
02df1f0
refactor: 비밀번호 변경 모달창 수정
ProblmZro May 22, 2024
dae3506
refactor: 비밀번호 변경 모달창 수정
ProblmZro May 29, 2024
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
3 changes: 2 additions & 1 deletion src/components/Modal/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const ModalMainContent = styled.div`
color: ${(props) =>
props.modalTheme === ModalTheme.NORMAL ? "#7bab6e" : "#FF6B6B"};
font-weight: 700;
padding-bottom: 2px;
letter-spacing: -0.02em;
`;

export const ModalSubContent = styled.div`
Expand All @@ -41,6 +41,7 @@ export const ModalSubContent = styled.div`
font-weight: 400;
color: ${(props) =>
props.modalTheme === ModalTheme.NORMAL ? "#7bab6e" : "#FF6B6B"};
letter-spacing: -0.02em;
`;

export const ModalBtnWrapper = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Main/Locker/LockerPrayerList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const S = {
);
box-shadow: 0px 2px 8px var(--color-locker-content-shadow);
border-radius: 16px;
margin: 12px 24px;
margin: 12px 24px 0px 24px;
outline: ${({ isChecked }) =>
isChecked ? `2px solid var(--color-dark-green)` : `var(--color-white)`};
transition: all 0.3s ease-in-out;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ const Settings = () => {
iconSrc={"images/ic_logout.svg"}
iconAlt={"icon_logout"}
mainContent={"로그아웃 하시겠습니까?"}
subContent={"보다 안전하게 로그아웃을 진행해 드릴게요."}
subContent={"안전하게 로그아웃을 진행해 드릴게요."}
btnContent={"로그아웃"}
btnContent2={"취소"}
onClickBtn={logout}
Expand Down
5 changes: 2 additions & 3 deletions src/utils/date.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ export const getCalculatedDiff = (date) => {

export const getDDayLabel = (date) => {
const diff = getCalculatedDiff(date);

if (diff === 0) return "D-Day";
if (diff > 0) return `D-${diff}`;
// if (diff === 0) return "D-Day";
// if (diff > 0) return `D-${diff}`;
Copy link
Collaborator

@alicehrk alicehrk May 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

사용하는 부분 있는지 확인해보고, 없다면 지워주세요

return `D+${Math.abs(diff)}`;
};