Skip to content

Commit

Permalink
chore: 일기 생성, 수정 모달 모양 선택 가로 스크롤로 변경, 3D 별 크기 약간 축소
Browse files Browse the repository at this point in the history
  • Loading branch information
dbwhdtjr0457 committed Dec 10, 2023
1 parent 9efed43 commit 49b289b
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
14 changes: 10 additions & 4 deletions FE/src/components/DiaryModal/DiaryCreateModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ function DiaryModalShapeSelectBox(props) {
<ShapeSelectBoxWrapper>
<ShapeSelectTextWrapper>
<DiaryModalTitle>모양</DiaryModalTitle>
<ShapeSelectText>직접 그리기</ShapeSelectText>
</ShapeSelectTextWrapper>
<ShapeSelectItemWrapper>
{shapeList?.map((shape) => (
Expand All @@ -251,7 +250,10 @@ function DiaryModalShapeSelectBox(props) {
setDiaryData((prev) => ({ ...prev, shapeUuid: shape.uuid }));
}}
>
<div dangerouslySetInnerHTML={{ __html: shape.data }} />
<div
dangerouslySetInnerHTML={{ __html: shape.data }}
style={{ width: "3rem", height: "3rem" }}
/>
</ShapeSelectBoxItem>
))}
</ShapeSelectItemWrapper>
Expand Down Expand Up @@ -291,12 +293,16 @@ const ShapeSelectItemWrapper = styled.div`
box-sizing: border-box;
color: #ffffff;
outline: none;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
gap: 1rem;
align-items: center;
overflow: auto;
overflow-y: hidden;
margin-bottom: 1rem;
gap: 1rem;
`;

const ShapeSelectBoxItem = styled.div`
Expand Down
11 changes: 7 additions & 4 deletions FE/src/components/DiaryModal/DiaryUpdateModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ function DiaryModalShapeSelectBox(props) {
<ShapeSelectBoxWrapper>
<ShapeSelectTextWrapper>
<DiaryModalTitle>모양</DiaryModalTitle>
<ShapeSelectText>직접 그리기</ShapeSelectText>
</ShapeSelectTextWrapper>
<ShapeSelectItemWrapper>
{shapeList?.map((shape) => (
Expand All @@ -312,7 +311,10 @@ function DiaryModalShapeSelectBox(props) {
setDiaryData((prev) => ({ ...prev, shapeUuid: shape.uuid }));
}}
>
<div dangerouslySetInnerHTML={{ __html: shape.data }} />
<div
dangerouslySetInnerHTML={{ __html: shape.data }}
style={{ width: "3rem", height: "3rem" }}
/>
</ShapeSelectBoxItem>
))}
</ShapeSelectItemWrapper>
Expand Down Expand Up @@ -353,11 +355,12 @@ const ShapeSelectItemWrapper = styled.div`
color: #ffffff;
outline: none;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
gap: 1rem;
align-items: center;
overflow: auto;
overflow-y: hidden;
margin-bottom: 1rem;
gap: 1rem;
`;

const ShapeSelectBoxItem = styled.div`
Expand Down
4 changes: 2 additions & 2 deletions FE/src/pages/StarPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ function Star(props) {
}
}}
>
<planeGeometry args={[1.5, 1.5]} />
<planeGeometry args={[1.2, 1.2]} />
<meshBasicMaterial map={texture} transparent />
</mesh>
<mesh
Expand All @@ -708,7 +708,7 @@ function Star(props) {
)}
position={position.map((p) => p * 1.01)}
>
<circleGeometry args={[0.6, 32]} />
<circleGeometry args={[0.5, 32]} />
<primitive object={material} attach='material' />
</mesh>
</>
Expand Down

0 comments on commit 49b289b

Please sign in to comment.