Skip to content

Commit 0eba0e8

Browse files
committed
Replace bespoke nav with contents list component
1 parent 09a9994 commit 0eba0e8

File tree

3 files changed

+4
-19
lines changed

3 files changed

+4
-19
lines changed

app/assets/stylesheets/helpers/_parts.scss

+3-9
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,10 @@
1414
}
1515

1616
.part-navigation {
17-
margin-bottom: 0;
18-
@include govuk-font(19);
17+
margin-left: 0;
1918

20-
@include govuk-media-query($from: tablet) {
21-
@include govuk-font(16);
22-
}
23-
24-
li {
25-
list-style: none;
26-
margin-bottom: 0.75em;
19+
@include govuk-media-query($until: tablet) {
20+
margin-left: govuk-spacing(1);
2721
}
2822
}
2923

app/views/content_items/travel_advice.html.erb

+1-9
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,7 @@
3636

3737
<aside class="part-navigation-container" role="complementary">
3838
<nav role="navigation" class="govuk-grid-row part-navigation" aria-label="Travel advice pages" data-module="track-click">
39-
<% @content_item.parts_navigation.each_with_index do |part_group, i| %>
40-
<ol class="govuk-grid-column-one-half" <% if i == 1 %> start="<%= @content_item.parts_navigation_second_list_start %>" <% end %>>
41-
<% part_group.each do |part_nav_item| %>
42-
<li>
43-
<%= part_nav_item %>
44-
</li>
45-
<% end %>
46-
</ol>
47-
<% end %>
39+
<%= render "govuk_publishing_components/components/contents_list", contents: @content_item.part_link_elements, underline_links: true %>
4840
</nav>
4941

5042
<%= render 'govuk_publishing_components/components/subscription-links', email_signup_link: @content_item.email_signup_link, feed_link: @content_item.feed_link %>

test/integration/travel_advice_test.rb

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class TravelAdviceTest < ActionDispatch::IntegrationTest
1414
assert page.has_css?("a[href=\"#{@content_item['details']['email_signup_link']}\"]", text: "Get email alerts")
1515
assert page.has_css?("a[href=\"#{@content_item['base_path']}.atom\"]", text: "Subscribe to feed")
1616

17-
assert page.has_css?(".part-navigation ol", count: 2)
1817
assert page.has_css?(".part-navigation li", count: @content_item["details"]["parts"].size + 1)
1918
assert page.has_css?(".part-navigation li", text: "Summary")
2019
assert_not page.has_css?(".part-navigation li a", text: "Summary")

0 commit comments

Comments
 (0)