Skip to content
Draft
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 @@ -160,7 +160,6 @@ export const MoreSection = ({
pillarDivider,
pillarDividerExtended,
]}
role="none"
>
<ul css={columnLinks} role="menu" id={moreSectionId}>
{links.map((link) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ export const Pillar = ({
!hasPageSkin && columnStyleFromLeftCol,
pillarDivider,
]}
role="none"
>
{/*
IMPORTANT NOTE: Supporting NoJS and accessibility is hard.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ const searchSubmit = css`
export const SearchBar = () => {
const searchId = 'gu-search';
return (
<form css={searchBar} action="https://www.google.co.uk/search">
<form
css={searchBar}
action="https://www.google.co.uk/search"
role="search"
>
<TextInput
hideLabel={true}
label="Search input"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ import {
space,
textSans17,
} from '@guardian/source/foundations';
import { Hide } from '@guardian/source/react-components';
import type { EditionId } from '../../../../lib/edition';
import { nestedOphanComponents } from '../../../../lib/ophan-helpers';
import type { LinkType, NavType } from '../../../../model/extract-nav';
import { palette as themePalette } from '../../../../palette';
import { expandedNavLinkStyles, listAccessibility } from '../commonStyles';
import {
expandedNavLinkStyles,
hideFromDesktop,
listAccessibility,
} from '../commonStyles';
import { MoreSection } from './MoreSection';
import { lineStyle, Pillar } from './Pillar';
import { ReaderRevenueLinks } from './ReaderRevenueLinks';
Expand Down Expand Up @@ -111,7 +114,6 @@ export const Sections = ({ nav, editionId, hasPageSkin }: Props) => {
return (
<ul
css={[columnsStyle, !hasPageSkin && columnsStyleFromLeftCol]}
role="menubar"
data-testid="nav-menu-columns"
>
{nav.pillars.map((column, i) => {
Expand Down Expand Up @@ -142,17 +144,17 @@ export const Sections = ({ nav, editionId, hasPageSkin }: Props) => {
);
})}

<Hide from="desktop">
<li role="none">
<SearchBar />
</li>
</Hide>
<div css={lineStyle}></div>
<li css={hideFromDesktop}>
<SearchBar />
</li>
<li css={lineStyle}></li>

<ReaderRevenueLinks
readerRevenueLinks={nav.readerRevenueLinks}
editionId={editionId}
/>
<li>
<ReaderRevenueLinks
readerRevenueLinks={nav.readerRevenueLinks}
editionId={editionId}
/>
</li>

{/* Mobile only Brand Extensions list */}
<MoreSection
Expand All @@ -163,7 +165,7 @@ export const Sections = ({ nav, editionId, hasPageSkin }: Props) => {
/>

{/* Desktop only Brand Extensions list*/}
<li css={desktopBrandExtensionColumn} role="none">
<li css={desktopBrandExtensionColumn}>
<SearchBar />

<ul
Expand All @@ -177,6 +179,7 @@ export const Sections = ({ nav, editionId, hasPageSkin }: Props) => {
<li
css={brandExtensionListItem}
key={brandExtension.title}
role="none"
>
<a
className="selectableMenuItem"
Expand Down
Loading