Skip to content

Commit

Permalink
Merge pull request #310 from TripInfoWeb/dev_icon
Browse files Browse the repository at this point in the history
Design: 수정, 삭제 아이콘 수정
  • Loading branch information
HyunJinNo authored Sep 17, 2024
2 parents 7f3e447 + b29407e commit e15eae2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 24 deletions.
23 changes: 11 additions & 12 deletions src/components/common/icons/DeleteIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,43 @@ const DeleteIcon = ({ className }: Props) => {
return (
<svg
className={className}
width="16"
height="16"
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M1.04688 2.96985H16.8998"
d="M1.07422 3.06006H16.9271"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M6.00098 13.8593L6.00098 5.93969"
d="M6.02734 13.9497L6.02734 6.03011"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M8.97363 13.8593L8.97363 5.93969"
d="M9 13.9497L9 6.03011"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M11.9453 13.8593L11.9453 5.93969"
d="M11.9727 13.9497L11.9727 6.03011"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M7.00977 1.5H10.9362C11.2124 1.5 11.4362 1.72386 11.4362 2V2.4598H6.50977V2C6.50977 1.72386 6.73362 1.5 7.00977 1.5ZM5.00977 2C5.00977 0.895429 5.9052 0 7.00977 0H10.9362C12.0408 0 12.9362 0.895431 12.9362 2V2.4598V2.96985H5.00977V2.4598V2Z"
fill="#A3A3A3"
stroke-width="0.5"
d="M7.03711 1.59033H10.9636C11.2397 1.59033 11.4636 1.81419 11.4636 2.09033V2.55013H6.53711V2.09033C6.53711 1.81419 6.76097 1.59033 7.03711 1.59033ZM5.03711 2.09033C5.03711 0.985761 5.93254 0.090332 7.03711 0.090332H10.9636C12.0681 0.090332 12.9636 0.985763 12.9636 2.09033V2.55013V3.06018H5.03711V2.55013V2.09033Z"
stroke-width="0.1"
/>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M2.03711 4.94978V13.8191C2.03711 16.0283 3.82797 17.8191 6.03711 17.8191H11.9084C14.1176 17.8191 15.9084 16.0283 15.9084 13.8191V4.94978H14.4084V13.8191C14.4084 15.1998 13.2891 16.3191 11.9084 16.3191H6.03711C4.6564 16.3191 3.53711 15.1998 3.53711 13.8191V4.94978H2.03711Z"
fill="#A3A3A3"
stroke-width="0.5"
d="M2.06445 5.04008V13.9094C2.06445 16.1186 3.85531 17.9094 6.06445 17.9094H11.9358C14.1449 17.9094 15.9358 16.1186 15.9358 13.9094V5.04008H14.4358V13.9094C14.4358 15.2901 13.3165 16.4094 11.9358 16.4094H6.06445C4.68374 16.4094 3.56445 15.2901 3.56445 13.9094V5.04008H2.06445Z"
stroke-width="0.1"
/>
</svg>
);
Expand Down
10 changes: 5 additions & 5 deletions src/components/common/icons/EditIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ const EditIcon = ({ className }: Props) => {
return (
<svg
className={className}
width="20"
height="20"
viewBox="0 0 22 21"
width="18"
height="18"
viewBox="0 0 19 19"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M14.5288 1.9437C15.0172 1.45576 15.809 1.45576 16.2974 1.9437L19.0726 4.7165C19.5609 5.20444 19.5609 5.99556 19.0726 6.4835L9.05327 16.4941C8.85152 16.6957 8.58685 16.8223 8.30318 16.8529L5.19226 17.1883C4.39872 17.2738 3.72913 16.6048 3.81477 15.812L4.15048 12.7038C4.18109 12.4203 4.30778 12.1559 4.50953 11.9543L14.5288 1.9437Z"
d="M13.02 1.4437C13.5084 0.955757 14.3002 0.955757 14.7886 1.4437L17.5638 4.2165C18.0521 4.70444 18.0521 5.49556 17.5638 5.9835L7.54448 15.9941C7.34273 16.1957 7.07806 16.3223 6.79439 16.3529L3.68347 16.6883C2.88993 16.7738 2.22034 16.1048 2.30598 15.312L2.64169 12.2038C2.6723 11.9203 2.79899 11.6559 3.00074 11.4543L13.02 1.4437Z"
stroke-width="1.5"
/>
<rect
x="0.350303"
width="3.46633"
height="0.495189"
transform="matrix(0.707413 0.7068 0.707413 -0.7068 13.5341 4.70214)"
transform="matrix(0.707413 0.7068 0.707413 -0.7068 12.0244 4.20211)"
fill="white"
stroke-width="0.495189"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/diary/detail/DiaryViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ const DiaryViewer = ({
수정
</Link>
<button
className="flex flex-row items-center gap-1 stroke-gray2 text-sm text-gray1 hover:stroke-main hover:text-main"
className="flex flex-row items-center gap-1 fill-gray2 stroke-gray2 text-sm text-gray1 hover:fill-main hover:stroke-main hover:text-main"
onClick={() => openModal()}
>
<DeleteIcon />
<DeleteIcon className="fill-inherit" />
삭제
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ const GatheringUpdateDeleteButtonComponent = ({
{authStore.id == userId && authStore.id > 0 && (
<div className="mt-6 flex w-full flex-row items-center justify-end gap-3 text-sm">
<Link
className="flex flex-row items-center gap-1 stroke-gray2 hover:text-main"
className="flex flex-row items-center gap-1 stroke-gray2 hover:stroke-main hover:text-main"
href={updateHref}
>
<EditIcon />
수정
</Link>
<button
className="items-center stroke-gray2 flex flex-row gap-1 hover:text-main"
className="flex flex-row items-center gap-1 stroke-gray2 hover:fill-main hover:stroke-main hover:text-main"
onClick={() => deleteHandler()}
>
<DeleteIcon />
<DeleteIcon className="fill-inherit" />
삭제
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/informations/detail/ButtonList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ const ButtonList = ({
수정
</Link>
<button
className="flex flex-row items-center gap-1 stroke-gray2 text-sm text-gray1 hover:stroke-main hover:text-main"
className="flex flex-row items-center gap-1 fill-gray2 stroke-gray2 text-sm text-gray1 hover:fill-main hover:stroke-main hover:text-main"
onClick={() => setModalVisible(true)}
>
<DeleteIcon />
<DeleteIcon className="fill-inherit" />
삭제
</button>
</div>
Expand Down

0 comments on commit e15eae2

Please sign in to comment.