From ee50cbdcf43569ea6bf2333ced4ae405c05e1785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=9D?= Date: Thu, 2 Feb 2023 01:51:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=EB=A9=94=EB=AA=A8=EC=A7=80=20?= =?UTF-8?q?=EC=A4=91=EC=95=99=20=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/RollingPaper/RollingMemo.js | 26 +++++++++++++++----------- src/page/RollingPaper/newMemo.js | 13 +++++++++---- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/page/RollingPaper/RollingMemo.js b/src/page/RollingPaper/RollingMemo.js index a5830a6..a68df51 100644 --- a/src/page/RollingPaper/RollingMemo.js +++ b/src/page/RollingPaper/RollingMemo.js @@ -55,17 +55,17 @@ export default function App({ list, isAdmin, HandleMemoDelete }) { position: 'absolute', }} > + {isAdmin ? ( + { + HandleMemoDelete(memo_id); + }} + /> + ) : ( +
+ )} - {isAdmin ? ( - { - HandleMemoDelete(memo_id); - }} - /> - ) : ( -
- )} {content} @@ -94,10 +94,14 @@ const MemoBox = styled.div` const MemoText = styled.div` width: 170px; + height: 170px; + display: flex; + justify-content: center; + align-items: center; word-break: break-all; + font-size: 1.2rem; color: ${props => props.font_color}; font-family: ${props => props.font}; - font-size: 1.2rem; `; const Name = styled.div` diff --git a/src/page/RollingPaper/newMemo.js b/src/page/RollingPaper/newMemo.js index 2552689..c4247db 100644 --- a/src/page/RollingPaper/newMemo.js +++ b/src/page/RollingPaper/newMemo.js @@ -45,10 +45,10 @@ export default function newMemo({ list, setCoor, setMemoData }) { position: 'absolute', }} > - + {content} - + from. {nickname}{' '} @@ -60,7 +60,6 @@ export default function newMemo({ list, setCoor, setMemoData }) { const MemoBox = styled.div` padding: 0.4rem; width: 184px; - font-size: 1.2rem; height: 174px; background: ${props => props.background}; border-radius: 15px; @@ -75,12 +74,18 @@ const MemoBox = styled.div` const MemoText = styled.div` width: 170px; + height: 170px; + display: flex; + justify-content: center; + align-items: center; word-break: break-all; - color: ${props => props.color}; + color: ${props => props.font_color}; font-family: ${props => props.font}; + font-size: 1.2rem; `; const Name = styled.div` text-align: right; align-items: end; + color: ${props => (props.color === 'white' ? 'black' : 'white')}; `; From 2421d863026aee54963b1ebbe768ea4453567758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=84=9D?= Date: Thu, 2 Feb 2023 01:52:04 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat=20:=20=EB=B2=84=ED=8A=BC=20=EC=83=89?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/DeleteBtn.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/component/DeleteBtn.js b/src/component/DeleteBtn.js index 9f5a5cd..d09c70b 100644 --- a/src/component/DeleteBtn.js +++ b/src/component/DeleteBtn.js @@ -10,6 +10,7 @@ const DelBtn = styled.button` z-index: 10000; right: ${props => props.right}; top: ${props => props.top}; + color: black; `; export default function DeleteBtn({ onClick, right, top }) {