diff --git a/rsconcept/frontend/src/components/Common/Dropdown.tsx b/rsconcept/frontend/src/components/Common/Dropdown.tsx index dd57ca5e..1ad70286 100644 --- a/rsconcept/frontend/src/components/Common/Dropdown.tsx +++ b/rsconcept/frontend/src/components/Common/Dropdown.tsx @@ -6,11 +6,11 @@ interface DropdownProps { function Dropdown({ children, dimensions = 'w-fit', stretchLeft }: DropdownProps) { return ( -
-
- {children} -
-
+
+
+ {children} +
+
); } diff --git a/rsconcept/frontend/src/components/Common/Modal.tsx b/rsconcept/frontend/src/components/Common/Modal.tsx index f144ec7c..0c0a4735 100644 --- a/rsconcept/frontend/src/components/Common/Modal.tsx +++ b/rsconcept/frontend/src/components/Common/Modal.tsx @@ -1,7 +1,9 @@ import { useRef } from 'react'; import useEscapeKey from '../../hooks/useEscapeKey'; +import { CrossIcon } from '../Icons'; import Button from './Button'; +import MiniButton from './MiniButton'; export interface ModalProps { title?: string @@ -35,16 +37,29 @@ function Modal({ if (onSubmit) onSubmit(); }; - return (<> + return ( + <>
- {title ?

{title}

: null} -
+
+
+ } + onClick={handleCancel} + /> +
+
+ + {title ?

{title}

: null} + +
{children}
-
+ +
{!readonly ?