govuk_publishing_components 12.17.0 → 12.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf83cc27bbb44657c8193582e9f26cfd1e36301a24ba5ed2ba92ac461577905
-  data.tar.gz: 59ac08cf3f8ead780a03d649fcef1ce65cb4b514af1ea557961764b24968accc
+  metadata.gz: 9637ab77188a87e3315641594e6b9b8658353730fdad44ec14e8b4883cb79a0b
+  data.tar.gz: eb41ede84098dc57a10a1401239f1d8766f66680256f9b9e8b18dc6ff0bb82b2
 SHA512:
-  metadata.gz: 4d90669dad89315ddadc53669ea3bb668e56661efb7bb2e3ad048fbc1723b65dab49e1b83d1988cc954c2d7b23058470def9c78a4527226467a1527c7dfa834c
-  data.tar.gz: a248d29a9794f949b176059d65e10b48a78a892f39d1d664d0ede520aaeee34be262e46997ae3924a0ff8817fb85602057e34ac2e428d86e334801dc5aa274c8
+  metadata.gz: 71b761c24f67ac9dd032dddaef4ff3bffc03423d376ed786176446fe1c44072c8aa41518a59d81301641190fc5534b2cc113f39e48e8d3ef786b0fc675a3f2e7
+  data.tar.gz: 1bee91ed89443c0d31e09597b5f56c8d56a329ecf763eb8ea0ac15d3442ea721087e1b0f85f29f26c6c1c60327033d4e928a5a8119666622e705810949bc9947

data/app/assets/stylesheets/govuk_publishing_components/components/_metadata.scss

@@ -3,6 +3,11 @@
   @include core-16;
   @include responsive-bottom-margin;
   @extend %contain-floats;
+
+  a {
+    @include govuk-link-common;
+    @include govuk-link-style-default;
+  }
 }
 
 .gem-c-metadata.direction-rtl {
@@ -10,6 +15,20 @@
   text-align: start;
 }
 
+.gem-c-metadata--inverse {
+  color: govuk-colour('white');
+
+  a:link,
+  a:active,
+  a:visited {
+    color: govuk-colour('white');
+  }
+
+  a:focus {
+    color: govuk-colour('black');
+  }
+}
+
 .gem-c-metadata__term {
   margin-top: 0.5em;
   line-height: normal;
@@ -43,14 +62,9 @@
     float: left;
     width: 70%;
   }
-
-  a {
-    @extend %govuk-link;
-  }
 }
 
 .gem-c-metadata__definition-link {
-  @extend %govuk-link;
   text-decoration: none;
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss

@@ -1,2 +1,15 @@
 @import "helpers/govuk-frontend-settings";
 @import "govuk-frontend/components/warning-text/warning-text";
+
+.gem-c-warning-text__text--no-indent {
+  padding-left: 0;
+  margin-left: 0;
+}
+
+.gem-c-warning-text__text--large {
+  @include govuk-font($size: 24, $weight: bold);
+}
+
+.gem-c-warning-text__text--highlight {
+  color: $govuk-error-colour;
+}

data/app/views/govuk_publishing_components/components/_metadata.html.erb

@@ -6,22 +6,27 @@
   part_of = Array(part_of)
 
   other ||= nil
+  inverse ||= false
 
   direction_class = ""
   direction_class = " direction-#{direction}" if local_assigns.include?(:direction)
+
+  classes = %w(gem-c-metadata)
+  classes << "direction-#{direction}" if local_assigns.include?(:direction)
+  classes << "gem-c-metadata--inverse" if inverse
 %>
-<div class="gem-c-metadata<%= direction_class %>" data-module="gem-toggle">
+<%= content_tag :div, class: classes, data: { module: "gem-toggle" } do %>
   <dl data-module="track-click">
     <% if from.any? %>
       <dt class="gem-c-metadata__term"><%= t("govuk_component.metadata.from", default: "From") %>:</dt>
       <dd class="gem-c-metadata__definition">
-        <%= render 'govuk_publishing_components/components/metadata/sentence', items: from, toggle_id: "from" %>
+        <%= render 'govuk_publishing_components/components/metadata/sentence', items: from, toggle_id: "from-#{SecureRandom.hex(4)}" %>
       </dd>
     <% end %>
     <% if part_of.any? %>
       <dt class="gem-c-metadata__term"><%= t("govuk_component.metadata.part_of", default: "Part of") %>:</dt>
       <dd class="gem-c-metadata__definition">
-        <%= render 'govuk_publishing_components/components/metadata/sentence', items: part_of, toggle_id: "part-of" %>
+        <%= render 'govuk_publishing_components/components/metadata/sentence', items: part_of, toggle_id: "part-of-#{SecureRandom.hex(4)}" %>
       </dd>
     <% end %>
     <% if local_assigns.include?(:history) %>
@@ -54,10 +59,10 @@
         <% if definition.any? %>
           <dt class="gem-c-metadata__term"><%= title %>:</dt>
           <dd class="gem-c-metadata__definition">
-            <%= render 'govuk_publishing_components/components/metadata/sentence', items: definition, toggle_id: index %>
+            <%= render 'govuk_publishing_components/components/metadata/sentence', items: definition, toggle_id: "#{index}-#{SecureRandom.hex(4)}" %>
           </dd>
         <% end %>
       <% end %>
     <% end %>
   </dl>
-</div>
+<% end %>

data/app/views/govuk_publishing_components/components/_warning_text.html.erb

@@ -1,15 +1,25 @@
 <%
   id ||= "warning-text-#{SecureRandom.hex(4)}"
   classes ||= ''
-  css_classes = %w(gem-c-warning-text govuk-warning-text)
-  css_classes << classes if classes
   text_assistive ||= 'Warning'
   text_icon ||= '!'
+  large_font ||= false
+  highlight_text ||= false
+
+  css_classes = %w(gem-c-warning-text govuk-warning-text)
+  css_classes << classes if classes
+
+  text_classes = %w(govuk-warning-text__text)
+  text_classes << "gem-c-warning-text__text--no-indent" if text_icon.empty?
+  text_classes << "gem-c-warning-text__text--large" if large_font
+  text_classes << "gem-c-warning-text__text--highlight" if highlight_text
 %>
 
 <%= tag.div id: id, class: css_classes do %>
-  <%= tag.span text_icon, class: "govuk-warning-text__icon", "aria-hidden": "true" %>
-  <%= tag.strong class: "govuk-warning-text__text" do %>
+  <% unless text_icon.empty? %>
+    <%= tag.span text_icon, class: "govuk-warning-text__icon", "aria-hidden": "true" %>
+  <% end %>
+  <%= tag.strong class: text_classes do %>
     <%= tag.span text_assistive, class: "govuk-warning-text__assistive" %>
     <%= text %>
   <% end %>

data/app/views/govuk_publishing_components/components/docs/metadata.yml

@@ -335,3 +335,23 @@ examples:
       first_published: 14 June 2014
       other:
         Applies to: England, Scotland, and Wales (see detailed guidance for <a href="http://www.dardni.gov.uk/news-dard-pa022-a-13-new-procedure-for" rel="external">Northern Ireland</a>)
+  on_a_dark_background:
+    data:
+      inverse: true
+      from: [
+        "<a href='/government/organisations/ministry-of-defence'>Ministry of Defence</a>",
+        "<a href='/government/organisations/cabinet-office'>Cabinet Office</a>",
+        "<a href=\"/government/organisations/department-for-business-energy-and-industrial-strategy\">Department for Business, Energy &amp; Industrial Strategy</a>",
+        "<a href=\"/government/organisations/foreign-commonwealth-office\">Foreign &amp; Commonwealth Office</a>",
+        "<a href=\"/government/people/william-hague\">The Rt Hon William Hague</a>",
+        "<a href=\"/government/organisations/department-for-environment-food-rural-affairs\">Department for Environment, Food &amp; Rural Affairs</a>",
+        "<a href=\"/government/organisations/department-for-work-pensions\">Department for work and pensions</a>",
+        "<a href=\"/government/organisations/foreign-commonwealth-office\">Foreign and Commonwealth Office</a>"
+      ]
+      first_published: 14 June 2014
+      last_updated: 10 September 2015
+      see_updates_link: true
+      other:
+        Applies to: England, Scotland, and Wales (see detailed guidance for <a href="http://www.dardni.gov.uk/news-dard-pa022-a-13-new-procedure-for" rel="external">Northern Ireland</a>)
+    context:
+      dark_background: true

data/app/views/govuk_publishing_components/components/docs/warning_text.yml

@@ -17,3 +17,15 @@ examples:
     data:
       text_icon: "£"
       text: "You can be fined up to £5,000 if you don’t register."
+  without_icon:
+    data:
+      text_icon: ""
+      text: "You can be fined up to £320 if you don't register."
+  with_larger_font:
+    data:
+      text: "This content was updated on the 24th of November 2018"
+      large_font: true
+  with_red_font:
+    data:
+      text: "This content has changed"
+      highlight_text: true

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '12.17.0'.freeze
+  VERSION = '12.18.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 12.17.0
+  version: 12.18.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govspeak