Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function Dropdown({
data-testid="navDropDownButton"
className={classes}
aria-expanded={isCurrentDropdown}
aria-controls={menuName.toLowerCase()}
aria-controls={`${menuName.toLowerCase().replace(/\s+/g, "-")}-dropdown`}
type="button"
onClick={(e) => {
handleToggle(e);
Expand All @@ -78,7 +78,7 @@ function Dropdown({
<Menu
items={dropdownList}
isOpen={isCurrentDropdown}
id={`${menuName}Dropdown`}
id={`${menuName.toLowerCase().replace(/\s+/g, "-")}-dropdown`}
/>
</>
);
Expand Down Expand Up @@ -464,6 +464,7 @@ const ReportStreamHeader = ({
<Header
data-testid="auth-header"
basic={true}
aria-label="Secondary navigation"
className={classnames(styles.AuthNavbar)}
>
<div className="usa-nav-container">
Expand All @@ -483,6 +484,7 @@ const ReportStreamHeader = ({
)}
<Header
basic={true}
aria-label="Primary navigation"
className={classnames(styles.Navbar, {
[styles.NavbarBlueVariant]: blueVariant,
[styles.NavbarDefault]: !blueVariant,
Expand All @@ -491,7 +493,7 @@ const ReportStreamHeader = ({
<div className="usa-nav-container">
<div className="usa-navbar">
<Title>
<USLink href="/" title="Home" aria-label="Home">
<USLink href="/" aria-label="ReportStream home">
ReportStream
{config.IS_PREVIEW && (
<span className={styles.ClientEnv}>
Expand Down
4 changes: 2 additions & 2 deletions frontend-react-original/src/content/home/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import site from "../site.json";

<HeroWrapper isAlternate className="rs-bg-grid">
<div className="grid-container">
<header className="usa-section usa-prose tablet:grid-col-10">
<section className="usa-section usa-prose tablet:grid-col-10">
<h1>CDC’s free, single connection to streamline your data transfer and improve public health</h1>
<p className="rs-subtitle">ReportStream now supports all reportable conditions. Contact us to learn what conditions we are currently receiving and how we can help you. </p>
<div className="grid-row margin-top-8 margin-bottom-2">
<A href={site.forms.connectWithRS.url} className="usa-button usa-button--big" target="_blank">Contact us</A>
</div>
</header>
</section>
</div>
</HeroWrapper>
<HeroWrapper>
Expand Down
5 changes: 4 additions & 1 deletion frontend-react-original/src/layouts/Main/MainLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ export const MainLayoutBase = ({ children }: MainLayoutBaseProps) => {
isFullWidth && "rs-style--alternate",
)}
>
<a className="usa-skipnav" href="#main-content">
Skip to main content
</a>
<ScrollRestoration />
<ReportStreamHeader blueVariant={isFullWidth} />
<main className="padding-top-5" id="main-content">
<main className="padding-top-5" id="main-content" tabIndex={-1}>
<InnerWrapper className={innerWrapperClassnames}>
<RSErrorBoundary>
{children}
Expand Down
Loading