Skip to content

모달 버튼 컴포넌트로 수정 #56

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

Merged
almighty55555 merged 1 commit into from
Mar 19, 2025
Merged

모달 버튼 컴포넌트로 수정 #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 17 additions & 32 deletions src/components/domain/rollingpaper/Card/Modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import ReactQuill from "react-quill";
import { textStyle } from "../../../../styles/textStyle";
import "../../../../styles/font.css";
import Badge from "../../../common/Badge/Badge";
import Button from "../../../common/Button/Button";

const Quill = ReactQuill.Quill;
var Font = Quill.import("formats/font");
Expand Down Expand Up @@ -54,12 +55,12 @@ const EditorWrapper = styled.div.withConfig({
}

.ql-editor p {
font-family: ${(props) => `'${props.$fontFamily || "Noto Sans KR"}'`} !important;
font-family: ${(props) => `'${props.$fontFamily || "Noto Sans KR"}'`} !important;
${(props) => textStyle(18, 400)(props)}
}
ql-editor h2 {
font-family: ${(props) => `'${props.$fontFamily || "Noto Sans KR"}'`} !important;
${(props) => textStyle(18, 400)(props)}
font-family: ${(props) => `'${props.$fontFamily || "Noto Sans KR"}'`} !important;
${(props) => textStyle(18, 400)(props)}
}
.ql-snow .ql-editor h2 {
font-size: 1rem;
Expand Down Expand Up @@ -91,33 +92,6 @@ const ModalContainer = styled.div`
justify-content: flex-start;
`;

const ConfirmButton = styled.button`
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding: 7px 16px;
gap: 10px;
position: absolute;
width: 120px;
height: 40px;
left: 240px;
top: 396px;
background: #9935ff;
border-radius: 6px;
color: white;
border: none;
cursor: pointer;

&:hover {
background: #7a2ecc;
}

&:active {
background: #5c2399;
}
`;

const DateContainer = styled.div`
position: absolute;
width: 70px;
Expand Down Expand Up @@ -175,9 +149,16 @@ const Divider = styled.div`
background: #eeeeee;
`;

const ButtonWrapper = styled.div`
position: absolute;
width: 120px;
height: 40px;
left: 240px;
top: 396px;
`

const Modal = ({ onClose, date, imageUrl, name,tag , content, font }) => {
const textAlign = "left";
console.log(font)
const fontFamily = font || "Noto Sans KR";
return (
<Background>
Expand Down Expand Up @@ -223,7 +204,11 @@ const Modal = ({ onClose, date, imageUrl, name,tag , content, font }) => {
style={{ fontFamily: fontFamily }}
/>
</EditorWrapper>
<ConfirmButton onClick={onClose}>확인</ConfirmButton>
<ButtonWrapper>
<Button variant="primary" size="40" width="120px" onClick={onClose}>
확인
</Button>
</ButtonWrapper>
</ModalContainer>
</Background>
);
Expand Down
Loading