diff --git a/cdhweb/static_src/components/MainNavDesktop/MainNavDesktopItem.tsx b/cdhweb/static_src/components/MainNavDesktop/MainNavDesktopItem.tsx index 22d8e48c..6cfcbb08 100644 --- a/cdhweb/static_src/components/MainNavDesktop/MainNavDesktopItem.tsx +++ b/cdhweb/static_src/components/MainNavDesktop/MainNavDesktopItem.tsx @@ -158,6 +158,7 @@ const DesktopMenuItem = ({ className={cx('main-nav-desktop__item', { 'main-nav-desktop__item--current-section': item.is_current, })} + aria-current={item.is_current ? 'page' : undefined} > {item.title} diff --git a/cdhweb/static_src/components/MainNavMobile/MainNavMobileItem.tsx b/cdhweb/static_src/components/MainNavMobile/MainNavMobileItem.tsx index a82da9ca..382cdf7e 100644 --- a/cdhweb/static_src/components/MainNavMobile/MainNavMobileItem.tsx +++ b/cdhweb/static_src/components/MainNavMobile/MainNavMobileItem.tsx @@ -35,7 +35,11 @@ const MobileMenuItem = ({ /> ) : ( - + {item.title} * { + // Make content appear in front of 3d box's solid background isolation: isolate; - z-index: 1; } } diff --git a/templates/includes/header.html b/templates/includes/header.html index 32415fd2..2b54c05c 100644 --- a/templates/includes/header.html +++ b/templates/includes/header.html @@ -44,8 +44,11 @@ class="main-nav-desktop__item {% if request.path|starts_with:item.link_url %} main-nav-desktop__item--current-section - {% endif %} - "> + {% endif %}" + {% if request.path|starts_with:item.link_url and not item.l2_items.all %} + aria-current="page" + {% endif %} + > {{ item.title }} {# Reserve space for dropdown icon, to stop jank when the React version replaces this version. #} {% if item.l2_items.all %} diff --git a/templates/includes/pagination.html b/templates/includes/pagination.html index 4e5178ed..4dbc7739 100644 --- a/templates/includes/pagination.html +++ b/templates/includes/pagination.html @@ -12,7 +12,7 @@ {# always display current page, marked as active #} {% if number == page_obj.number %} - {{ number }} + {{ number }} {# for current page 1 or 2, display first 5 #} {% elif page_obj.number <= 2 and number <= 5 %}