Skip to content
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

fix: challenge modal styles #987

Merged
merged 2 commits into from
Apr 19, 2022
Merged

fix: challenge modal styles #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64279f3
fix: challenge modal styles
amanharwara Apr 19, 2022
ce3988f
Merge branch 'develop' into fix/challenge-modal-styles
amanharwara Apr 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
8 changes: 5 additions & 3 deletions app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,11 @@ export const ChallengeModal: FunctionComponent<Props> = ({
)}
<ProtectedIllustration className="w-30 h-30 mb-4" />
<div className="font-bold text-lg text-center max-w-76 mb-3">{challenge.heading}</div>
<div className="text-center text-sm max-w-76 mb-4">{challenge.subheading}</div>
{challenge.subheading && (
<div className="text-center text-sm max-w-76 mb-4 break-word">{challenge.subheading}</div>
)}
<form
className="flex flex-col items-center min-w-76 mb-4"
className="flex flex-col items-center min-w-76"
onSubmit={(e) => {
e.preventDefault()
submit().catch(console.error)
Expand All @@ -230,7 +232,7 @@ export const ChallengeModal: FunctionComponent<Props> = ({
<Button
variant="primary"
disabled={isProcessing}
className="min-w-76 mb-3.5"
className="min-w-76 mt-1 mb-3.5"
onClick={() => {
submit().catch(console.error)
}}
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/Components/ChallengeModal/ChallengePrompt.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ export const ChallengeModalPrompt: FunctionComponent<Props> = ({
}, [isInvalid])

return (
<>
<div className="w-full mb-3">
{prompt.validation === ChallengeValidation.ProtectionSessionDuration ? (
<div className="mt-3 min-w-76">
<div className="min-w-76">
<div className="text-sm font-medium mb-2">Allow protected access for</div>
<div className="flex items-center justify-between bg-grey-4 rounded p-1">
{ProtectionSessionDurations.map((option) => {
Expand Down Expand Up @@ -91,6 +91,6 @@ export const ChallengeModalPrompt: FunctionComponent<Props> = ({
{isInvalid && (
<div className="text-sm color-danger mt-2">Invalid authentication, please try again.</div>
)}
</>
</div>
)
}