Browse Source

Fix display of auth modal. Re #2262. (#2265)

pull/2267/head
Matthew Heller 3 years ago committed by GitHub
parent
commit
125343808d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      web/components/modals/FediAuthModal/FediAuthModal.tsx
  2. 9
      web/components/modals/IndieAuthModal/IndieAuthModal.tsx
  3. 2
      web/components/ui/Modal/Modal.tsx
  4. 4
      web/styles/ant-overrides.scss

7
web/components/modals/FediAuthModal/FediAuthModal.tsx

@ -139,12 +139,7 @@ export const FediAuthModal: FC<FediAuthModalProps> = ({ @@ -139,12 +139,7 @@ export const FediAuthModal: FC<FediAuthModalProps> = ({
value={account}
placeholder="youraccount@yourserver.com"
status={!valid && account.length > 0 ? 'error' : undefined}
onPressEnter={submitAccountPressed}
enterButton={
<Button onClick={submitAccountPressed} disabled={!valid}>
Authenticate with Fediverse
</Button>
}
onSearch={submitAccountPressed}
/>
</>
);

9
web/components/modals/IndieAuthModal/IndieAuthModal.tsx

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import { Alert, Button, Input, Space, Spin, Collapse, Typography } from 'antd';
import { Alert, Input, Space, Spin, Collapse, Typography } from 'antd';
import React, { FC, useState } from 'react';
import isValidURL from '../../../utils/urls';
@ -124,12 +124,7 @@ export const IndieAuthModal: FC<IndieAuthModalProps> = ({ @@ -124,12 +124,7 @@ export const IndieAuthModal: FC<IndieAuthModalProps> = ({
value={host}
placeholder="yoursite.com"
status={!valid && host.length > 0 ? 'error' : undefined}
onPressEnter={submitButtonPressed}
enterButton={
<Button onClick={submitButtonPressed} disabled={!valid}>
Authenticate with your domain
</Button>
}
onSearch={submitButtonPressed}
/>
<Collapse ghost>

2
web/components/ui/Modal/Modal.tsx

@ -83,6 +83,4 @@ Modal.defaultProps = { @@ -83,6 +83,4 @@ Modal.defaultProps = {
handleOk: undefined,
handleCancel: undefined,
afterClose: undefined,
height: '40vh',
width: '70%',
};

4
web/styles/ant-overrides.scss

@ -118,7 +118,9 @@ DROPDOWN @@ -118,7 +118,9 @@ DROPDOWN
.ant-modal-title {
color: var(--theme-color-components-modal-header-text);
}
.ant-modal-body {
overflow: scroll;
}
.ant-modal {
color: var(--theme-color-components-text-on-light);
h1 {

Loading…
Cancel
Save