diff --git a/src/App.tsx b/src/App.tsx index 1949e72..2655f8f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -40,7 +40,18 @@ function App() { - + @@ -70,7 +81,13 @@ function App() { - + { - const { id, historyList, title, textAlign, theme, titleColor, shape } = props; + const { id, historyList, title, textAlign, theme, historyTitleColor, shape, headerTitleColor, dateColor, descriptionColor } = props; return ( - +
{title}

{historyList?.map((elements, idx) => ( - + ))}
@@ -69,6 +69,7 @@ const Wrap = styled.div` padding: 10px 10px 20px 10px; font-size: 33px; font-weight: 800; + color: ${({ headerTitleColor }) => headerTitleColor ?? 'black'}; } hr { border: 0; diff --git a/src/lib/components/Experience/History/Basic.tsx b/src/lib/components/Experience/History/Basic.tsx index 61a6a16..1c9be41 100644 --- a/src/lib/components/Experience/History/Basic.tsx +++ b/src/lib/components/Experience/History/Basic.tsx @@ -1,12 +1,12 @@ import styled from 'styled-components'; -import { ExperienceHistoryListType } from '../../../common/types/ComponentTypes/ExperienceType'; +import { ExperienceHistoryListType, ExperienceStyledPropsType } from '../../../common/types/ComponentTypes/ExperienceType'; const Basic = (props: ExperienceHistoryListType) => { - const { startDate, endDate, title, des } = props; + const { startDate, endDate, title, des, historyTitleColor, dateColor, descriptionColor } = props; return (
- +
{startDate} {endDate} @@ -19,7 +19,7 @@ const Basic = (props: ExperienceHistoryListType) => { }; export default Basic; -const Wrap = styled.div` +const Wrap = styled.div` margin: 0 auto; padding: 0em 4vw; display: flex; @@ -28,6 +28,7 @@ const Wrap = styled.div` flex-wrap: wrap; border-bottom: 0.2px solid #b4b4b4a2; .date { + color: ${({ dateColor }) => dateColor ?? 'black'}; width: 15%; padding: 2em; flex-grow: 1; @@ -46,6 +47,7 @@ const Wrap = styled.div` } } .child-title { + color: ${({ historyTitleColor }) => historyTitleColor ?? 'black'}; width: 15%; flex-grow: 1; font-size: 22px; @@ -57,6 +59,7 @@ const Wrap = styled.div` } } .des { + color: ${({ descriptionColor }) => descriptionColor ?? 'black'}; padding: 2em; flex-grow: 2; width: 30%; diff --git a/src/lib/components/Experience/History/Box.tsx b/src/lib/components/Experience/History/Box.tsx index e0d5f72..94d357a 100644 --- a/src/lib/components/Experience/History/Box.tsx +++ b/src/lib/components/Experience/History/Box.tsx @@ -1,12 +1,12 @@ import styled from 'styled-components'; -import { ExperienceHistoryListType } from '../../../common/types/ComponentTypes/ExperienceType'; +import { ExperienceHistoryListType, ExperienceStyledPropsType } from '../../../common/types/ComponentTypes/ExperienceType'; const Box = (props: ExperienceHistoryListType) => { - const { startDate, endDate, title, des } = props; + const { startDate, endDate, title, des, historyTitleColor, dateColor, descriptionColor } = props; return (
- +
{startDate} {endDate} @@ -19,7 +19,7 @@ const Box = (props: ExperienceHistoryListType) => { }; export default Box; -const Wrap = styled.div` +const Wrap = styled.div` margin: 10px; padding: 0em 4vw; display: flex; @@ -32,6 +32,7 @@ const Wrap = styled.div` width: 15%; padding: 2em; flex-grow: 1; + color: ${({ dateColor }) => dateColor ?? 'black'}; @media screen and (max-width: 800px) { width: 100%; text-align: center; @@ -47,6 +48,7 @@ const Wrap = styled.div` } } .child-title { + color: ${({ historyTitleColor }) => historyTitleColor ?? 'black'}; width: 15%; flex-grow: 1; font-size: 22px; @@ -59,6 +61,7 @@ const Wrap = styled.div` } } .des { + color: ${({ descriptionColor }) => descriptionColor ?? 'black'}; padding: 2em; flex-grow: 2; width: 30%; diff --git a/src/lib/components/Experience/History/Vertical.tsx b/src/lib/components/Experience/History/Vertical.tsx index 165bff2..eedb662 100644 --- a/src/lib/components/Experience/History/Vertical.tsx +++ b/src/lib/components/Experience/History/Vertical.tsx @@ -1,11 +1,11 @@ import styled, { css } from 'styled-components'; -import { VerticalPropsType, ExperienceVerticalOptionType } from '../../../common/types/ComponentTypes/ExperienceType'; +import { VerticalPropsType, ExperiencePropsType } from '../../../common/types/ComponentTypes/ExperienceType'; const Vertical = (props: VerticalPropsType) => { - const { startDate, endDate, title, des, shape, titleColor } = props; + const { startDate, endDate, title, des, shape, historyTitleColor, dateColor, descriptionColor } = props; return ( - +
{startDate} @@ -22,10 +22,10 @@ export default Vertical; Vertical.defaultProps = { shape: 'square', - titleColor: 'black', + historyTitleColor: 'black', }; -const Wrap = styled.div` +const Wrap = styled.div` width: 25em; padding: 10px 2em 1.2em 2em; margin: 1em auto; @@ -47,6 +47,7 @@ const Wrap = styled.div` .intro { margin: 10px; .date { + color: ${({ dateColor }) => dateColor ?? 'black'}; margin: 15px 0px 10px 0px; font-size: 13px; .start-date { @@ -60,11 +61,14 @@ const Wrap = styled.div` } } .child-title { - color: ${({ titleColor }) => titleColor ?? 'black'}; + color: ${({ historyTitleColor }) => historyTitleColor ?? 'black'}; font-size: 25px; font-weight: 600; padding: 7px; border-bottom: 1px solid #b4b4b4a2; } + .des { + color: ${({ descriptionColor }) => descriptionColor ?? 'black'}; + } } `; diff --git a/src/lib/components/VisitorComment/CommentInput.tsx b/src/lib/components/VisitorComment/CommentInput.tsx index 18a07d2..f8f744b 100644 --- a/src/lib/components/VisitorComment/CommentInput.tsx +++ b/src/lib/components/VisitorComment/CommentInput.tsx @@ -21,6 +21,8 @@ const CommentInput = (props: VisitorCommentPropsType) => { comment, nickname, password, + inputFontColor, + inputPlacehoderColor, } = props; const textareaRef = useRef(null); @@ -33,7 +35,13 @@ const CommentInput = (props: VisitorCommentPropsType) => { }; return ( - +