diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dc8f96808..b27c3fa15d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ## 37.8.0 * Disable the single consent cookie API code ([PR #3916](https://github.com/alphagov/govuk_publishing_components/pull/3916)) +* Remove "Popular" links from super navigation header ([PR #3918](https://github.com/alphagov/govuk_publishing_components/pull/3918)) ## 37.7.1 diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss b/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss index 131e310781..3007868d56 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss @@ -884,7 +884,11 @@ $after-button-padding-left: govuk-spacing(4); } .gem-c-layout-super-navigation-header__search-form { - padding: 0 0 govuk-spacing(8) 0; + padding: 0; + + @include govuk-media-query($from: "desktop") { + padding-bottom: govuk-spacing(2); + } } // Popular links. @@ -893,17 +897,6 @@ $after-button-padding-left: govuk-spacing(4); padding: govuk-spacing(1) 0; } -.gem-c-layout-super-navigation-header__popular-link { - display: inline-block; - font-size: 16px; - font-size: govuk-px-to-rem(16px); - padding: 0; - - &::after { - @include make-selectable-area-bigger; - } -} - .gem-c-layout-super-navigation-header__width-container { @include govuk-media-query($until: "desktop") { margin: 0; @@ -988,11 +981,6 @@ $after-button-padding-left: govuk-spacing(4); } @include govuk-media-query($until: tablet) { - .gem-c-layout-super-navigation-header__popular-links-heading--large-navbar { - font-size: 24px; - font-size: govuk-px-to-rem(24px); - } - // can't disable responsive styling because using override classes // from govuk-frontend which are all responsive so have to supply // custom class to the label of the search component to turn off diff --git a/app/views/govuk_publishing_components/components/_layout_super_navigation_header.html.erb b/app/views/govuk_publishing_components/components/_layout_super_navigation_header.html.erb index 77cb2992fc..6d1f4544d6 100644 --- a/app/views/govuk_publishing_components/components/_layout_super_navigation_header.html.erb +++ b/app/views/govuk_publishing_components/components/_layout_super_navigation_header.html.erb @@ -15,8 +15,6 @@ navigation_menu_heading = t("components.layout_super_navigation_header.navigation_menu_heading") navigation_search_heading = t("components.layout_super_navigation_header.navigation_search_heading") navigation_search_subheading = t("components.layout_super_navigation_header.navigation_search_subheading") - popular_links = t("components.layout_super_navigation_header.popular_links") - popular_links_heading = t("components.layout_super_navigation_header.popular_links_heading") search_text = t("components.layout_super_navigation_header.search_text") hide_search_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.hide", :label => "search") @@ -68,9 +66,6 @@ dropdown_menu_classes = %w(gem-c-layout-super-navigation-header__navigation-dropdown-menu) dropdown_menu_classes << "gem-c-layout-super-navigation-header__navigation-dropdown-menu--large-navbar" if large_navbar - popular_links_heading_classes = %w(govuk-heading-m) - popular_links_heading_classes << "gem-c-layout-super-navigation-header__popular-links-heading--large-navbar" if large_navbar - absolute_links_helper = GovukPublishingComponents::Presenters::AbsoluteLinksHelper.new() %> <%= content_tag("header", @@ -385,45 +380,6 @@ -
-
- <%= content_tag(:h3, { - class: popular_links_heading_classes - }) do %> - <%= popular_links_heading %> - <% end %> - -
-
<% end %> diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 70d3401868..3457449116 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -127,8 +127,6 @@ ar: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: من diff --git a/config/locales/az.yml b/config/locales/az.yml index acd54be59a..e356663dff 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -124,8 +124,6 @@ az: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: "...dan (dən)" diff --git a/config/locales/be.yml b/config/locales/be.yml index 3428405c46..ef5bd06a99 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -130,8 +130,6 @@ be: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: З diff --git a/config/locales/bg.yml b/config/locales/bg.yml index d06a24f6dd..a2e3b4420c 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -128,8 +128,6 @@ bg: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: От diff --git a/config/locales/bn.yml b/config/locales/bn.yml index fbb5412c66..60f9d2533d 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -125,8 +125,6 @@ bn: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: থেকে diff --git a/config/locales/cs.yml b/config/locales/cs.yml index b839c3072b..107a689fc8 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -129,8 +129,6 @@ cs: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: 'Komu I:' diff --git a/config/locales/cy.yml b/config/locales/cy.yml index cb0f9b3253..966cbe41b1 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -128,8 +128,6 @@ cy: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Gan diff --git a/config/locales/da.yml b/config/locales/da.yml index 1bdd7572eb..d1e64b3a94 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -125,8 +125,6 @@ da: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Fra diff --git a/config/locales/de.yml b/config/locales/de.yml index 9491e3faf6..d233fc9b6a 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -128,8 +128,6 @@ de: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Von diff --git a/config/locales/dr.yml b/config/locales/dr.yml index 641e1d392a..4d6f3e9371 100644 --- a/config/locales/dr.yml +++ b/config/locales/dr.yml @@ -126,8 +126,6 @@ dr: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: از diff --git a/config/locales/el.yml b/config/locales/el.yml index 7d55610c93..85b6185dac 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -124,8 +124,6 @@ el: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Από diff --git a/config/locales/en.yml b/config/locales/en.yml index e1e0f857e2..cf706f0757 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -231,20 +231,6 @@ en: navigation_menu_heading: Navigation menu navigation_search_heading: Search and popular pages navigation_search_subheading: Search - popular_links: - - label: Get support with the cost of living - href: "/cost-of-living" - - label: Find out about help you can get with your energy bills - href: "/get-help-energy-bills" - - label: Find a job - href: "/find-a-job" - - label: 'Universal Credit account: sign in' - href: "/sign-in-universal-credit" - - label: Check your National Insurance record - href: "/check-national-insurance-record" - - label: 'Check MOT history of a vehicle' - href: /check-mot-history - popular_links_heading: Popular on GOV.UK search_text: Search GOV.UK metadata: from: From diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml index f73a7b4b6a..2106165a54 100644 --- a/config/locales/es-419.yml +++ b/config/locales/es-419.yml @@ -124,8 +124,6 @@ es-419: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Desde diff --git a/config/locales/es.yml b/config/locales/es.yml index 8e8818f972..6152070ff6 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -124,8 +124,6 @@ es: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Desde diff --git a/config/locales/et.yml b/config/locales/et.yml index 57d5bed414..cc1e98d0b7 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -127,8 +127,6 @@ et: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Alates diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 69f942bbee..30b4b0e2cf 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -123,8 +123,6 @@ fa: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: از diff --git a/config/locales/fi.yml b/config/locales/fi.yml index c7614f5a2a..bff247a23a 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -126,8 +126,6 @@ fi: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Alkaen diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 46feffcd27..9ebfa3b8a8 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -124,8 +124,6 @@ fr: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: De diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 0209a0bce7..0d3eb78f34 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -126,8 +126,6 @@ gd: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: De diff --git a/config/locales/gu.yml b/config/locales/gu.yml index 243870e7ab..c0e04599ee 100644 --- a/config/locales/gu.yml +++ b/config/locales/gu.yml @@ -124,8 +124,6 @@ gu: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: થી diff --git a/config/locales/he.yml b/config/locales/he.yml index b33122e89d..63c7f67691 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -124,8 +124,6 @@ he: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: מ- diff --git a/config/locales/hi.yml b/config/locales/hi.yml index f074cde1d0..15de9fe25f 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -124,8 +124,6 @@ hi: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: से diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 0eb556ed43..ae234be727 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -125,8 +125,6 @@ hr: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Iz diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 9b62868f74..7baf9aa253 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -127,8 +127,6 @@ hu: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Feladó diff --git a/config/locales/hy.yml b/config/locales/hy.yml index faf73dfcbd..ea37da0be1 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -128,8 +128,6 @@ hy: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Ումից՝ diff --git a/config/locales/id.yml b/config/locales/id.yml index 332dd6da52..00486abca8 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -124,8 +124,6 @@ id: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Dari diff --git a/config/locales/is.yml b/config/locales/is.yml index 12211e2485..bbe6f313ec 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -124,8 +124,6 @@ is: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Frá diff --git a/config/locales/it.yml b/config/locales/it.yml index 4208b6c4a1..a239971b44 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -124,8 +124,6 @@ it: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Da diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 34e197c463..955a841905 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -120,8 +120,6 @@ ja: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: から diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 05ff1934e1..010310458d 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -127,8 +127,6 @@ ka: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: დან diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 360796c46a..2127f7f4d5 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -124,8 +124,6 @@ kk: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Кімнен diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 80f4c6f71c..91d51ee7af 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -119,8 +119,6 @@ ko: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index a11b93c836..093819170f 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -129,8 +129,6 @@ lt: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Nuo diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 82cffbd295..f86de929fd 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -128,8 +128,6 @@ lv: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: 'No' diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 2647927c11..fac931ab22 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -123,8 +123,6 @@ ms: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Daripada diff --git a/config/locales/mt.yml b/config/locales/mt.yml index 7b05f82bda..a348829e74 100644 --- a/config/locales/mt.yml +++ b/config/locales/mt.yml @@ -126,8 +126,6 @@ mt: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Minn diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 62056f2a00..32699b0105 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -124,8 +124,6 @@ nl: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Van diff --git a/config/locales/no.yml b/config/locales/no.yml index 00d83fa578..a821f9167a 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -124,8 +124,6 @@ navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Fra diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml index eda588dae7..f154a1452b 100644 --- a/config/locales/pa-pk.yml +++ b/config/locales/pa-pk.yml @@ -120,8 +120,6 @@ pa-pk: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: ایتھوں diff --git a/config/locales/pa.yml b/config/locales/pa.yml index fdda93c68e..7be57a8054 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -124,8 +124,6 @@ pa: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: ਤੋਂ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 4f181d9541..aa36d2b3c7 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -128,8 +128,6 @@ pl: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Od diff --git a/config/locales/ps.yml b/config/locales/ps.yml index 1089a3b8b0..f1adb3becf 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -121,8 +121,6 @@ ps: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: له diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 0a5cc91829..c1179658e9 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -124,8 +124,6 @@ pt: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: De diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 097be8ad83..09b056cd25 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -125,8 +125,6 @@ ro: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: De la diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 216ee14dcd..84bd33211c 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -128,8 +128,6 @@ ru: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Из diff --git a/config/locales/si.yml b/config/locales/si.yml index cd5e5116c8..888392173b 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -124,8 +124,6 @@ si: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: සිට diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 36c2f85d5c..7eb378220b 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -129,8 +129,6 @@ sk: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Od diff --git a/config/locales/sl.yml b/config/locales/sl.yml index e598c3db1e..dd912584e7 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -131,8 +131,6 @@ sl: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Od diff --git a/config/locales/so.yml b/config/locales/so.yml index 45fb854629..790a800c6b 100644 --- a/config/locales/so.yml +++ b/config/locales/so.yml @@ -124,8 +124,6 @@ so: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Laga bilaabo diff --git a/config/locales/sq.yml b/config/locales/sq.yml index a8dff15d7f..7329f68873 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -124,8 +124,6 @@ sq: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Nga diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 470cb44606..aa806e3508 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -125,8 +125,6 @@ sr: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Od diff --git a/config/locales/sv.yml b/config/locales/sv.yml index a4acf09295..e2c9ee2f02 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -124,8 +124,6 @@ sv: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Från diff --git a/config/locales/sw.yml b/config/locales/sw.yml index 51a23646b4..e839fca462 100644 --- a/config/locales/sw.yml +++ b/config/locales/sw.yml @@ -124,8 +124,6 @@ sw: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Kuanzia diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 96b2739aa6..3db079953a 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -125,8 +125,6 @@ ta: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: இதிலிருந்து diff --git a/config/locales/th.yml b/config/locales/th.yml index 1807ba8d19..8924c44587 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -122,8 +122,6 @@ th: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: จาก diff --git a/config/locales/tk.yml b/config/locales/tk.yml index e5e9a37ad3..48e9abebdc 100644 --- a/config/locales/tk.yml +++ b/config/locales/tk.yml @@ -125,8 +125,6 @@ tk: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: "-dan" diff --git a/config/locales/tr.yml b/config/locales/tr.yml index a45fb97e7f..e6af86c347 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -125,8 +125,6 @@ tr: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Şuradan diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 79c66b5eb3..a4d2edf62f 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -131,8 +131,6 @@ uk: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Від diff --git a/config/locales/ur.yml b/config/locales/ur.yml index 2d0a27316f..f58d2d4f61 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -121,8 +121,6 @@ ur: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: از diff --git a/config/locales/uz.yml b/config/locales/uz.yml index 8118f6da09..326cfe7d28 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -126,8 +126,6 @@ uz: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: дан diff --git a/config/locales/vi.yml b/config/locales/vi.yml index ed9ee0bcb3..4d9da8cce9 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -123,8 +123,6 @@ vi: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: Từ diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index cd97fc65c5..0d92b05ef4 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -122,8 +122,6 @@ zh-hk: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: 來自 diff --git a/config/locales/zh-tw.yml b/config/locales/zh-tw.yml index 1c472c509f..0fa90237bb 100644 --- a/config/locales/zh-tw.yml +++ b/config/locales/zh-tw.yml @@ -122,8 +122,6 @@ zh-tw: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: 從 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 88f55d14ac..fb02009290 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -122,8 +122,6 @@ zh: navigation_menu_heading: navigation_search_heading: navigation_search_subheading: - popular_links: - popular_links_heading: search_text: metadata: from: 从 diff --git a/spec/components/layout_super_navigation_header_spec.rb b/spec/components/layout_super_navigation_header_spec.rb index 7514c331aa..ea98a3e77f 100644 --- a/spec/components/layout_super_navigation_header_spec.rb +++ b/spec/components/layout_super_navigation_header_spec.rb @@ -166,13 +166,11 @@ def component_name render_component({ ga4_tracking: true }) assert_select "header[data-module='gem-track-click ga4-event-tracker ga4-link-tracker']" - assert_select "a[data-ga4-link]", count: 29 + assert_select "a[data-ga4-link]", count: 23 assert_select 'a[data-ga4-link=\'{"event_name":"navigation","type":"header menu bar","external":"false","text":"GOV.UK","section":"Logo","index_link":1,"index_section":0,"index_section_count":2,"index_total":1}\']' assert_select 'a[data-ga4-link=\'{"event_name":"navigation","type":"header menu bar","index_section":1,"index_link":1,"index_section_count":4,"index_total":16,"section":"Services and information"}\']' assert_select 'a[data-ga4-link=\'{"event_name":"navigation","type":"header menu bar","index_section":1,"index_link":16,"index_section_count":4,"index_total":16,"section":"Services and information"}\']' assert_select 'a[data-ga4-link=\'{"event_name":"navigation","type":"header menu bar","index_section":2,"index_link":1,"index_section_count":4,"index_total":6,"section":"Government activity"}\']' assert_select 'a[data-ga4-link=\'{"event_name":"navigation","type":"header menu bar","index_section":2,"index_link":6,"index_section_count":4,"index_total":6,"section":"Government activity"}\']' - assert_select 'a[data-ga4-link=\'{"event_name":"navigation","type":"header menu bar","index_section":4,"index_link":1,"index_section_count":4,"index_total":6,"section":"Popular on GOV.UK"}\']' - assert_select 'a[data-ga4-link=\'{"event_name":"navigation","type":"header menu bar","index_section":4,"index_link":5,"index_section_count":4,"index_total":6,"section":"Popular on GOV.UK"}\']' end end diff --git a/spec/javascripts/components/layout-super-navigation-header-spec.js b/spec/javascripts/components/layout-super-navigation-header-spec.js index 532670abc1..63447d938b 100644 --- a/spec/javascripts/components/layout-super-navigation-header-spec.js +++ b/spec/javascripts/components/layout-super-navigation-header-spec.js @@ -171,28 +171,6 @@ describe('The super header navigation', function () { '' + '' + '' + - '
' + - '
' + - '

Popular on GOV.UK

' + - '' + - '
' + - '
' + '' + '' + '' @@ -350,9 +328,6 @@ describe('The super header navigation', function () { var $navLinks var $firstNavLink var $lastNavLink - var $searchMenu - var $searchLinks - var $lastSearchLink beforeEach(function () { thisModule.init() @@ -362,9 +337,6 @@ describe('The super header navigation', function () { $navLinks = $navMenu.querySelectorAll('li') $firstNavLink = $navLinks[0].querySelector('a') $lastNavLink = $navLinks[$navLinks.length - 1].querySelector('a') - $searchMenu = document.querySelector('#super-search-menu') - $searchLinks = $searchMenu.querySelectorAll('li a') - $lastSearchLink = $searchLinks[$searchLinks.length - 1] }) it('when the Menu button is focussed, the nav menu is open and the tab key is pressed focus moves to the first nav menu link', function () { @@ -402,17 +374,6 @@ describe('The super header navigation', function () { expect(document.activeElement).toEqual($lastNavLink) }) - - it('when the last search menu link is focussed and the tab key is pressed the search menu is closed', function () { - $searchMenu.removeAttribute('hidden') - $lastSearchLink.focus() - window.GOVUK.triggerEvent($lastSearchLink, 'keydown', { keyCode: 9, cancelable: true }) - - expect($searchMenu.hasAttribute('hidden')).toEqual(true) - expect($searchMenuButton.getAttribute('aria-expanded')).toEqual('false') - expect($searchMenuButton.getAttribute('aria-label')).toEqual('Show search menu') - expect($searchMenuButton.classList).not.toContain('gem-c-layout-super-navigation-header__open-button') - }) }) describe('escape key', function () {