Merge branch 'dummy-app-updates'

x-govuk · Apr 28, 2021 · 89a8d90 · 89a8d90
2 parents fb264dd + fe2f290
commit 89a8d90
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 28 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    govuk-components (1.1.8)
+    govuk-components (1.1.9)
       activemodel (>= 6.0)
       railties (>= 6.0)
       view_component (~> 2.20)
@@ -161,7 +161,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
-    view_component (2.30.0)
+    view_component (2.31.1)
       activesupport (>= 5.0.0, < 7.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)

diff --git a/docs/index.html b/docs/index.html
@@ -11085,13 +11085,13 @@ <h2 class="govuk-cookie-banner__heading govuk-heading-m">
   </section>
   <section>
     <pre><code class="language-ruby">render GovukComponent::CookieBanner.new(title: "Cookies on a service") do |component|
-  component.with(:body) do
+  component.body do
     safe_join([
       tag.p("A paragraph.", class: "govuk-body"),
       tag.p("A second, smaller paragraph.", class: "govuk-body-s"),
     ])
   end
-  component.with(:actions) do
+  component.actions do
     safe_join([
       govuk_link_to("Accept cookies", "#accept", button: true),
       govuk_link_to("Reject cookies", "#reject", button: true),
@@ -11288,8 +11288,8 @@ <h2 class="govuk-heading-s">Header</h2>
             GOV.UK
           </span>
         </span>
-      </a>
 
+      </a>
     </div>
     <div class="govuk-header__content">
         <a href="/amazing-service/home" class="govuk-header__link govuk-header__link--service-name">
@@ -11326,8 +11326,8 @@ <h2 class="govuk-heading-s">Header without service name</h2>
             Custom
           </span>
         </span>
-      </a>
 
+      </a>
     </div>
     <div class="govuk-header__content">
 
@@ -11357,12 +11357,12 @@ <h2 class="govuk-heading-s">Header with a product name and custom description</h
             GOV.UK
           </span>
         </span>
-      </a>
-        <span class="govuk-header__product-name">
-          Custom product name
-        </span>
+          <span class="govuk-header__product-name">
+            Custom product name
+          </span>
 
-        <strong class="govuk-tag govuk-tag--yellow">Coming soon!</strong>
+          <strong class="govuk-tag govuk-tag--yellow">Coming soon!</strong>
+      </a>
     </div>
     <div class="govuk-header__content">
 
@@ -11395,27 +11395,24 @@ <h2 class="govuk-heading-s">Header with navigation</h2>
             Some service
           </span>
         </span>
-      </a>
 
+      </a>
     </div>
     <div class="govuk-header__content">
 
+        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="Show or hide navigation menu">
+          Menu
+        </button>
         <nav>
-          <ul class="govuk-header__navigation " aria-label="Top Level Navigation">
+          <ul class="govuk-header__navigation" aria-label="Top Level Navigation">
               <li class="govuk-header__navigation-item">
-                <a class="govuk-header__link" href="/#page-a">
-                  Page A
-                </a>
+                  <a class="govuk-header__link" href="/#page-a">Page A</a>
 </li>              <li class="govuk-header__navigation-item">
-                <a class="govuk-header__link" href="/#page-b">
-                  Page B
-                </a>
+                  <a class="govuk-header__link" href="/#page-b">Page B</a>
 </li>              <li class="govuk-header__navigation-item govuk-header__navigation-item--active">
-                <a class="govuk-header__link" href="/#page-c">
-                  Page C
-                </a>
-</li>          </ul>
-        </nav>
+                  <a class="govuk-header__link" href="/#page-c">Page C</a>
+</li>
+</ul>        </nav>
     </div>
   </div>
 </header>
@@ -11484,7 +11481,7 @@ <h2 class="govuk-heading-s">Email links</h2>
   <h2 class="govuk-heading-s">Button links (this will render a form that POSTs)</h2>
   <section>
     <form class="button_to" method="post" action="/">
-<input class="govuk-button" type="submit" value="Home"><input type="hidden" name="authenticity_token" value="gO2ZB6aa0zCbJlvAjS2+RQbeaQE1nGsltsa9kRiMrmX3wL2VQ2SYNwhKb9yTn5mpxDcLp0UAlfulvtISujqEIQ==">
+<input class="govuk-button" type="submit" value="Home"><input type="hidden" name="authenticity_token" value="SkbREYgXhlkTsFBvzFBNmryjTerr8tpurNPWsCgdll+4Czfs8jCWNmRBUQ7+QrUnVMsyGCl03UHn3vqajQS08Q==">
 </form>
   </section>
   <section>

diff --git a/lib/govuk/components/version.rb b/lib/govuk/components/version.rb
@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '1.1.8'.freeze
+    VERSION = '1.1.9'.freeze
   end
 end
diff --git a/spec/dummy/app/views/demos/examples/_cookie_banner.html.erb b/spec/dummy/app/views/demos/examples/_cookie_banner.html.erb
@@ -2,13 +2,13 @@
 
 <%= render "shared/example", title: "Cookie banner", example: <<~COOKIE_BANNER
   render GovukComponent::CookieBanner.new(title: "Cookies on a service") do |component|
-    component.with(:body) do
+    component.body do
       safe_join([
         tag.p("A paragraph.", class: "govuk-body"),
         tag.p("A second, smaller paragraph.", class: "govuk-body-s"),
       ])
     end
-    component.with(:actions) do
+    component.actions do
       safe_join([
         govuk_link_to("Accept cookies", "#accept", button: true),
         govuk_link_to("Reject cookies", "#reject", button: true),