Merge pull request #551 from alphagov/fix-no-js-toggle

Fix toggle behaviour when JS disabled
alphagov · Oct 3, 2018 · 5514d0d · 5514d0d
2 parents 200cb61 + e85ac26
commit 5514d0d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## Unreleased
+
+* Fix toggle behaviour in related navigation and taxonomy navigation when JS disabled (PR #551)
+
 ## 11.1.0
 
 * Add Admin analytics script (#555)

diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_related-navigation.scss b/app/assets/stylesheets/govuk_publishing_components/components/_related-navigation.scss
@@ -36,6 +36,14 @@
   }
 }
 
+.gem-c-related-navigation__toggle {
+  display: none;
+
+  .js-enabled & {
+    display: block;
+   }
+}
+
 .gem-c-related-navigation__section-link {
   @include bold-16;
 }

diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_taxonomy-navigation.scss b/app/assets/stylesheets/govuk_publishing_components/components/_taxonomy-navigation.scss
@@ -62,6 +62,14 @@
   text-decoration: none;
 }
 
+.gem-c-taxonomy-navigation__toggle {
+  display: none;
+
+  .js-enabled & {
+    display: block;
+   }
+}
+
 
 .gem-c-taxonomy-navigation__section-heading {
   border-top: 1px solid $border-colour;

diff --git a/app/views/govuk_publishing_components/components/_taxonomy_navigation.html.erb b/app/views/govuk_publishing_components/components/_taxonomy_navigation.html.erb
@@ -92,6 +92,7 @@
               <% if hidden_links.any? %>
                 <li class="gem-c-taxonomy-navigation__link toggle-wrap">
                   <a href="#"
+                    class="gem-c-taxonomy-navigation__toggle"
                     data-controls="toggle_<%= section_name %>"
                     data-expanded="false"
                     data-toggled-text="<%= t("govuk_component.metadata.toggle_less", default: "Show fewer") %>">

diff --git a/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb b/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb
@@ -44,6 +44,7 @@
     <% if links.length > section_link_limit %>
       <li class="gem-c-related-navigation__link toggle-wrap">
         <a href="#"
+          class="gem-c-related-navigation__toggle"
           data-controls="toggle_<%= section_title %>"
           data-expanded="false"
           data-toggled-text="<%= t("govuk_component.metadata.toggle_less", default: "Show fewer") %>">