Skip to content

Commit

Permalink
fix: icon 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
jikwan0327 committed Aug 17, 2023
1 parent 583c028 commit 6fbb724
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@team-return/design-system",
"version": "1.0.81",
"version": "1.0.88",
"repository": {
"type": "git",
"url": "https://github.com/Team-Return/JOBIS-DESIGN-SYSTEM.git"
Expand Down
3 changes: 3 additions & 0 deletions src/components/radiobutton/RadioButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interface RadioButtonProps extends marginCssType {
disabled?: boolean;
onClick?: () => void;
value?: string;
checked?: boolean;
name?: string;
}

Expand All @@ -20,6 +21,7 @@ export const RadioButton = ({
margin,
children,
name,
checked,
value,
}: RadioButtonProps) => {
return (
Expand All @@ -31,6 +33,7 @@ export const RadioButton = ({
type="radio"
value={value}
disabled={disabled}
checked={checked}
name={name}
/>
{children}
Expand Down
3 changes: 1 addition & 2 deletions src/components/toast/Toast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const Toast = ({
message = 'Message',
}: ToastProps) => {
const [isOut, setIsOut] = useState(false);
const { delete: del, list } = useToastStore();
const { delete: del } = useToastStore();

useEffect(() => {
setTimeout(() => {
Expand All @@ -44,7 +44,6 @@ export const Toast = ({
<div>
<Text color="gray10" size="Heading6">
{title}
{id}
</Text>
<Text color="gray10" size="Body2">
{message}
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export * from './components/radiobutton/RadioButton';
export * from './components/modal/Modal';
export * from './components/table/Table';
export * from './components/toast/Toast';
export * from './components/loading/Loading';
// export * from './components/loading/Loading';
export * from './components/stack';
export * from './context/ToastContext';
export * from './components/toast/ToastContainer';
4 changes: 4 additions & 0 deletions src/styles/icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import Trash from './icons/Trash';
import MyPg from './icons/MyPg';
import EditPencil from './icons/EditPencil';
import KebabMenu from './icons/KebabMenu';
import BookmarkOn from './icons/BookmarkOn';
import BookmarkOff from './icons/BookmarkOff';

// Icon paths
export const icons = {
Expand All @@ -43,4 +45,6 @@ export const icons = {
MyPg: <MyPg />,
EditPencil: <EditPencil />,
KebabMenu: <KebabMenu />,
BookmarkOff: <BookmarkOff />,
BookmarkOn: <BookmarkOn />,
} as const;
18 changes: 18 additions & 0 deletions src/styles/icons/BookmarkOff.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const BookmarkOff = () => {
return (
<svg
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M6 6C6 5.46957 6.21071 4.96086 6.58579 4.58579C6.96086 4.21071 7.46957 4 8 4H16C16.5304 4 17.0391 4.21071 17.4142 4.58579C17.7893 4.96086 18 5.46957 18 6V19.5C18 19.5904 17.9754 19.6792 17.9289 19.7568C17.8824 19.8343 17.8157 19.8979 17.736 19.9405C17.6563 19.9832 17.5664 20.0035 17.4761 19.9992C17.3858 19.9948 17.2983 19.9661 17.223 19.916L12 17.101L6.777 19.916C6.70171 19.9661 6.61423 19.9948 6.52389 19.9992C6.43355 20.0035 6.34373 19.9832 6.264 19.9405C6.18427 19.8979 6.1176 19.8343 6.07111 19.7568C6.02462 19.6792 6.00005 19.5904 6 19.5V6ZM8 5C7.73478 5 7.48043 5.10536 7.29289 5.29289C7.10536 5.48043 7 5.73478 7 6V18.566L11.723 16.084C11.8051 16.0294 11.9014 16.0003 12 16.0003C12.0986 16.0003 12.1949 16.0294 12.277 16.084L17 18.566V6C17 5.73478 16.8946 5.48043 16.7071 5.29289C16.5196 5.10536 16.2652 5 16 5H8Z"
fill="#7F7F7F"
/>
</svg>
);
};

export default BookmarkOff;
20 changes: 20 additions & 0 deletions src/styles/icons/BookmarkOn.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import Bookmark from './BookmarkOff';

const BookmarkOn = () => {
return (
<svg
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M6 6V19.5C5.99994 19.5868 6.02248 19.6722 6.06542 19.7476C6.10836 19.8231 6.17022 19.8861 6.24489 19.9304C6.31957 19.9747 6.40449 19.9988 6.4913 20.0003C6.57812 20.0018 6.66383 19.9807 6.74 19.939L12 17.069L17.26 19.939C17.3362 19.9807 17.4219 20.0018 17.5087 20.0003C17.5955 19.9988 17.6804 19.9747 17.7551 19.9304C17.8298 19.8861 17.8916 19.8231 17.9346 19.7476C17.9775 19.6722 18.0001 19.5868 18 19.5V6C18 5.46957 17.7893 4.96086 17.4142 4.58579C17.0391 4.21071 16.5304 4 16 4H8C7.46957 4 6.96086 4.21071 6.58579 4.58579C6.21071 4.96086 6 5.46957 6 6Z"
fill="#237BC9"
/>
</svg>
);
};

export default BookmarkOn;
8 changes: 4 additions & 4 deletions src/styles/icons/EditPencil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ const EditPencil = () => {
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<g clip-path="url(#clip0_12475_6713)">
<g clip-path="url(#clip0_12391_6870)">
<path
d="M12 8C13.1 8 14 7.1 14 6C14 4.9 13.1 4 12 4C10.9 4 10 4.9 10 6C10 7.1 10.9 8 12 8ZM12 10C10.9 10 10 10.9 10 12C10 13.1 10.9 14 12 14C13.1 14 14 13.1 14 12C14 10.9 13.1 10 12 10ZM12 16C10.9 16 10 16.9 10 18C10 19.1 10.9 20 12 20C13.1 20 14 19.1 14 18C14 16.9 13.1 16 12 16Z"
fill="black"
d="M3 17.2505V21.0005H6.75L17.81 9.94055L14.06 6.19055L3 17.2505ZM20.71 7.04055C21.1 6.65055 21.1 6.02055 20.71 5.63055L18.37 3.29055C17.98 2.90055 17.35 2.90055 16.96 3.29055L15.13 5.12055L18.88 8.87055L20.71 7.04055Z"
fill="#135C9D"
/>
</g>
<defs>
<clipPath id="clip0_12475_6713">
<clipPath id="clip0_12391_6870">
<rect width="24" height="24" fill="white" />
</clipPath>
</defs>
Expand Down

0 comments on commit 6fbb724

Please sign in to comment.