Skip to content

Regression: Modal footer alignment #26635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 6 commits into from
Aug 19, 2022
Merged

Regression: Modal footer alignment #26635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d805d13
fix alignment
yash-rajpal Aug 19, 2022
1a874ab
fix alignment on FederationModal
yash-rajpal Aug 19, 2022
1830502
remove unnecessary style
yash-rajpal Aug 19, 2022
cf1e7c6
fix: review
dougfabris Aug 19, 2022
a7c5ad6
Merge branch 'develop' into chore/modal-footer-alignment
kodiakhq[bot] Aug 19, 2022
74c56d9
Merge branch 'develop' into chore/modal-footer-alignment
kodiakhq[bot] Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/meteor/client/components/GenericModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const GenericModal: FC<GenericModalProps> = ({
<Modal.Close title={t('Close')} onClick={onClose} />
</Modal.Header>
<Modal.Content fontScale='p2'>{children}</Modal.Content>
<Modal.Footer>
<Modal.Footer justifyContent={dontAskAgain ? 'space-between' : 'end'}>
{dontAskAgain}
<Modal.FooterControllers>
{onCancel && (
Expand Down
4 changes: 2 additions & 2 deletions ...eor/client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ export const FederationModal: FC<{ onClose: () => void }> = ({ onClose, ...props
</Modal.Content>
</>
)}
<Modal.Footer>
<Modal.Footer justifyContent='space-between'>
{currentStep === 2 && (
<Box mbs='x8' color='hint' fontSize='x12' position='absolute'>
<Box color='hint' fontSize='x12'>
{t('Federation_DNS_info_update')}
</Box>
)}
Expand Down
4 changes: 2 additions & 2 deletions ...eteor/ee/client/deviceManagement/components/featureModal/DeviceManagementFeatureModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ const DeviceManagementFeatureModal = ({ close }: { close: () => void }): ReactEl
<FeatureModalBullets key={index} title={title} subtitle={subtitle} icon={icon} />
))}
</Modal.Content>
<Modal.Footer>
<Modal.Footer justifyContent='space-between'>
<ExternalLink to={documentationURL}>{t('Learn_more')}</ExternalLink>
<Modal.FooterControllers>
<ExternalLink to={documentationURL}>{t('Learn_more')}</ExternalLink>
<Button onClick={handleGotit}>{t('Got_it')}</Button>
</Modal.FooterControllers>
</Modal.Footer>
Expand Down