diff --git a/src/containers/dialogs/ExampleDialog/index.tsx b/src/containers/dialogs/ExampleDialog/index.tsx index 1b8d120a..0d972f93 100644 --- a/src/containers/dialogs/ExampleDialog/index.tsx +++ b/src/containers/dialogs/ExampleDialog/index.tsx @@ -26,7 +26,7 @@ const ExampleDialog: FC = ({ onRequestClose }) => { useCloseOnEscape(onRequestClose); return ( - +
diff --git a/src/containers/dialogs/LoginDialog/index.tsx b/src/containers/dialogs/LoginDialog/index.tsx index 04520f9a..a4f3f52f 100644 --- a/src/containers/dialogs/LoginDialog/index.tsx +++ b/src/containers/dialogs/LoginDialog/index.tsx @@ -4,7 +4,7 @@ import { IDialogProps } from '~/redux/modal/constants'; import { useCloseOnEscape } from '~/utils/hooks'; import { Group } from '~/components/containers/Group'; import { InputText } from '~/components/input/InputText'; -import { Button } from '../../../components/input/Button/index'; +import { Button } from '~/components/input/Button'; import { Padder } from '~/components/containers/Padder'; import * as styles from './styles.scss'; type IProps = IDialogProps & {}; @@ -13,8 +13,6 @@ const LoginDialog: FC = ({ onRequestClose }) => { const [username, setUserName] = useState(''); const [password, setPassword] = useState(''); - const title =
title
; - const buttons = ( @@ -26,7 +24,7 @@ const LoginDialog: FC = ({ onRequestClose }) => { useCloseOnEscape(onRequestClose); return ( - +
diff --git a/src/containers/dialogs/LoginDialog/styles.scss b/src/containers/dialogs/LoginDialog/styles.scss index f416c025..bbfc0dd1 100644 --- a/src/containers/dialogs/LoginDialog/styles.scss +++ b/src/containers/dialogs/LoginDialog/styles.scss @@ -2,7 +2,6 @@ display: flex; align-items: flex-start; justify-content: center; - min-height: 400px; - padding: 20px; + padding: 20px 20px 60px 20px; margin: auto; } diff --git a/src/containers/dialogs/ScrollDialog/index.tsx b/src/containers/dialogs/ScrollDialog/index.tsx index fd4b3268..ab702881 100644 --- a/src/containers/dialogs/ScrollDialog/index.tsx +++ b/src/containers/dialogs/ScrollDialog/index.tsx @@ -28,11 +28,11 @@ const ScrollDialog: FC = ({ onOverlayClick, onRefCapture }) => { - const [height, setHeight] = useState(window.innerHeight - 240); + const [height, setHeight] = useState(window.innerHeight - 120); const [show_top_sticky, setShowTopSticky] = useState(false); const [ref, setRef] = useState(null); - const onResize = useCallback(() => setHeight(window.innerHeight - 240), []); + const onResize = useCallback(() => setHeight(window.innerHeight - 120), []); useEffect(() => { window.addEventListener("resize", onResize); @@ -60,7 +60,7 @@ const ScrollDialog: FC = ({
diff --git a/src/containers/dialogs/ScrollDialog/styles.scss b/src/containers/dialogs/ScrollDialog/styles.scss index 80e9bf6c..383d36c2 100644 --- a/src/containers/dialogs/ScrollDialog/styles.scss +++ b/src/containers/dialogs/ScrollDialog/styles.scss @@ -20,17 +20,17 @@ align-items: center; justify-content: center; position: relative; - padding: 0; + padding: 10px 0 0 0; box-sizing: border-box; flex: 1 1 800px; z-index: 1; &:global(.has_title) { - padding-top: 64px + 15px; // +15px + padding-top: 60px + 10px; // +15px } &:global(.has_buttons) { - padding-bottom: 64px + 15px; // +15px + padding-bottom: 60px + 10px; // +15px } } @@ -51,6 +51,11 @@ } .top { + height: 10px; + top: 0; + + &:global(.has_buttons) { height: 60px; top: 15px;} + .wrap { display: flex; align-items: flex-end; diff --git a/src/redux/modal/reducer.ts b/src/redux/modal/reducer.ts index f6b830c1..f1cd2b78 100644 --- a/src/redux/modal/reducer.ts +++ b/src/redux/modal/reducer.ts @@ -10,7 +10,7 @@ export interface IModalState { const INITIAL_STATE: IModalState = { is_shown: true, - dialog: DIALOGS.LOGIN, + dialog: DIALOGS.TEST, }; export default createReducer(INITIAL_STATE, MODAL_HANDLERS);