Skip to content

Update status page layout margins to correct value #6544

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
aduth merged 3 commits into from
Jul 5, 2022
Merged

Update status page layout margins to correct value #6544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d602ab4
Revise status page action margin to 2.5rem top margin
aduth Jul 1, 2022
138fc85
Refactor ForgotPassword to StatusPage
aduth Jul 1, 2022
ba87897
Add changelog
aduth Jul 1, 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 app/components/status_page_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%= content %>

<% if action_buttons? %>
<div class="margin-top-4">
<div class="margin-top-5">
<% action_buttons.each do |action| %>
<div class="margin-top-2">
<%= action %>
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/packages/components/status-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function StatusPage({
<PageHeading>{header}</PageHeading>
{children}
{actionButtons.length > 0 && (
<div className="margin-top-4">
<div className="margin-top-5">
{actionButtons.map((actionButton, index) => (
<div key={index} className="margin-top-2">
{actionButton}
Expand Down
40 changes: 20 additions & 20 deletions app/javascript/packages/verify-flow/steps/password-confirm/forgot-password.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { PageHeading } from '@18f/identity-components';
import { StatusPage } from '@18f/identity-components';
import { t } from '@18f/identity-i18n';
import { getAssetPath } from '@18f/identity-assets';
import { HistoryLink } from '@18f/identity-form-steps';
import PasswordResetButton from './password-reset-button';

Expand All @@ -10,28 +9,29 @@ interface ForgotPasswordProps {

export function ForgotPassword({ stepPath }: ForgotPasswordProps) {
return (
<>
<img
src={getAssetPath('status/info-question.svg')}
width="54"
height="54"
alt={t('components.status_page.icons.question')}
className="margin-bottom-4"
/>
<PageHeading>{t('idv.forgot_password.modal_header')}</PageHeading>
<StatusPage
status="info"
icon="question"
header={t('idv.forgot_password.modal_header')}
actionButtons={[
<HistoryLink
key="try_again"
basePath={stepPath}
step={undefined}
isVisualButton
isBig
isWide
>
{t('idv.forgot_password.try_again')}
</HistoryLink>,
<PasswordResetButton key="password_reset" />,
]}
>
<ul className="usa-list">
{t(['idv.forgot_password.warnings']).map((warning) => (
<li key={warning}>{warning}</li>
))}
</ul>
<div className="margin-top-4">
<HistoryLink basePath={stepPath} step={undefined} isVisualButton isBig isWide>
{t('idv.forgot_password.try_again')}
</HistoryLink>
</div>
<div className="margin-top-2">
<PasswordResetButton />
</div>
</>
</StatusPage>
);
}
2 changes: 1 addition & 1 deletion app/views/idv/shared/_error.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ locals:
<%= yield %>

<% if local_assigns[:action] %>
<div class="margin-top-4">
<div class="margin-top-5">
<%= button_or_link_to(
action[:text],
action[:url],
Expand Down