Modals: Fix button positions (#2584)

This commit is contained in:
Alexander Zinchuk 2023-02-19 02:50:03 +01:00
parent 069f4f5b2f
commit 4b3559a381
7 changed files with 56 additions and 41 deletions

View File

@ -36,7 +36,9 @@ const AboutAdsModal: FC<OwnProps> = ({
/>
</p>
<p>{renderText(lang('SponsoredMessageInfoDescription4'), ['br'])}</p>
<Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Close')}</Button>
<div className="dialog-buttons mt-2">
<Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Close')}</Button>
</div>
</Modal>
);
};

View File

@ -49,13 +49,15 @@ const DeleteProfilePhotoModal: FC<OwnProps> = ({
isOpen={isOpen}
onClose={onClose}
onEnter={handleDeletePhoto}
className="delete"
title="Are you sure?"
className="delete dialog-buttons-column"
title={lang('AreYouSure')}
>
<Button color="danger" className="confirm-dialog-button" isText onClick={handleDeletePhoto}>
{lang('Preview.DeletePhoto')}
</Button>
<Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Cancel')}</Button>
<div className="dialog-buttons mt-2">
<Button color="danger" className="confirm-dialog-button" isText onClick={handleDeletePhoto}>
{lang('Preview.DeletePhoto')}
</Button>
<Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Cancel')}</Button>
</div>
</Modal>
);
};

View File

@ -65,13 +65,15 @@ const SeenByModal: FC<OwnProps & StateProps> = ({
</ListItem>
))}
</div>
<Button
className="confirm-dialog-button"
isText
onClick={handleCloseSeenByModal}
>
{lang('Close')}
</Button>
<div className="dialog-buttons mt-2">
<Button
className="confirm-dialog-button"
isText
onClick={handleCloseSeenByModal}
>
{lang('Close')}
</Button>
</div>
</Modal>
);
};

View File

@ -30,10 +30,12 @@ const UnpinAllMessagesModal: FC<OwnProps> = ({
title={lang('Chat.PanelUnpinAllMessages')}
>
<p>{lang('Chat.UnpinAllMessagesConfirmation', pinnedMessagesCount, 'i')}</p>
<Button className="confirm-dialog-button" isText onClick={onUnpin}>
{lang('DialogUnpin')}
</Button>
<Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Cancel')}</Button>
<div className="dialog-buttons mt-2">
<Button className="confirm-dialog-button" isText onClick={onUnpin}>
{lang('DialogUnpin')}
</Button>
<Button className="confirm-dialog-button" isText onClick={onClose}>{lang('Cancel')}</Button>
</div>
</Modal>
);
};

View File

@ -102,15 +102,17 @@ const Dialogs: FC<StateProps> = ({ dialogs, animationLevel }) => {
: lang('MemberRequests.RequestToJoinDescriptionGroup')}
</p>
)}
<Button
isText
className="confirm-dialog-button"
// eslint-disable-next-line react/jsx-no-bind
onClick={handleJoinClick}
>
{isRequestNeeded ? requestToJoinText : joinText}
</Button>
<Button isText className="confirm-dialog-button" onClick={closeModal}>{lang('Cancel')}</Button>
<div className="dialog-buttons mt-2">
<Button
isText
className="confirm-dialog-button"
// eslint-disable-next-line react/jsx-no-bind
onClick={handleJoinClick}
>
{isRequestNeeded ? requestToJoinText : joinText}
</Button>
<Button isText className="confirm-dialog-button" onClick={closeModal}>{lang('Cancel')}</Button>
</div>
</Modal>
);
};
@ -132,7 +134,7 @@ const Dialogs: FC<StateProps> = ({ dialogs, animationLevel }) => {
onCloseAnimationEnd={dismissDialog}
>
{lang('AreYouSureShareMyContactInfoBot')}
<div>
<div className="dialog-buttons mt-2">
<Button
className="confirm-dialog-button"
isText
@ -158,7 +160,7 @@ const Dialogs: FC<StateProps> = ({ dialogs, animationLevel }) => {
>
{error.hasErrorKey ? getReadableErrorText(error)
: renderText(error.message!, ['simple_markdown', 'emoji', 'br'])}
<div>
<div className="dialog-buttons mt-2">
<Button isText onClick={closeModal}>{lang('OK')}</Button>
</div>
</Modal>

View File

@ -39,6 +39,7 @@
width: 100%;
display: flex;
align-items: flex-end;
justify-content: flex-end;
margin-top: 1rem;
}

View File

@ -239,12 +239,14 @@ const PaymentModal: FC<OwnProps & StateProps & GlobalStateProps> = ({
>
<h4>{error.description || 'Error'}</h4>
<p>{error.description || 'Error'}</p>
<Button
isText
onClick={handleClearPaymentError}
>
{lang('OK')}
</Button>
<div className="dialog-buttons mt-2">
<Button
isText
onClick={handleClearPaymentError}
>
{lang('OK')}
</Button>
</div>
</Modal>
);
}
@ -518,12 +520,14 @@ const PaymentModal: FC<OwnProps & StateProps & GlobalStateProps> = ({
Sorry, Telegram WebZ doesn&apos;t support payments with this provider yet. <br />
Please use one of our mobile apps to do this.
</p>
<Button
isText
onClick={closeModal}
>
{lang('OK')}
</Button>
<div className="dialog-buttons mt-2">
<Button
isText
onClick={closeModal}
>
{lang('OK')}
</Button>
</div>
</Modal>
);
}