govuk_publishing_components 21.3.0 → 21.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbcad820792648c45683e5b4226a47f17353ec7c8018089dd375e239db1ee43e
-  data.tar.gz: 30e3861a060a0c9c476a3f0d0ee2628753e7fcd7972ce638f2ea7ec5ea33a5de
+  metadata.gz: 076d12dde5ae718e4121452456f278ab864c4b58b95e2e1bc38be2ce9baf24f0
+  data.tar.gz: 876634e138bef21c35e7a1766f3e65f9bfb04b6636e3bff57a9515d8731cbfa5
 SHA512:
-  metadata.gz: 2a77463ccd09451691c92bcf2a10fac990b9ce93d37320a1a9b300626b9902d6c054ac8afd26aae9b330f37460f0113e9e1f8a75297fb7f4a89438a4a64a0b5f
-  data.tar.gz: 8dccc6978ed550e5ee4718ab0e3bdd08752b1738dc1cefa3b914eff872ae6ce541e965b1548315ac7a102be4fb9251bf08dbb0bf2ae90b426980dfd9d05ecb85
+  metadata.gz: e82a6343d77e6abd5cd893a51311dc4af3a6581f1dd735e546eb58ddf5f66c412f4969ae9129937c303b02f123de16722b6d524320379d48bdf0778b79b63808
+  data.tar.gz: 959208582bc3452e230d01a66541d04c98ef267abaa2c5d7a284ca7c4118c2f607abea49e2bc821acbd9f5c651d2534d9d6f9d1a4c6ac503729869688be1f200

data/app/assets/stylesheets/component_guide/application.scss

@@ -7,6 +7,8 @@
 @import "govuk/helpers/all";
 @import "govuk/core/all";
 
+$gem-guide-border-width: 1px;
+
 .component-guide-wrapper {
   padding-bottom: $govuk-gutter * 1.5;
 }
@@ -34,10 +36,6 @@
   }
 }
 
-.component-body {
-  margin-bottom: $govuk-gutter * 1.5;
-}
-
 .component-guide-hidden {
   display: none;
 }
@@ -86,13 +84,13 @@
 }
 
 .component-call {
-  margin-top: $govuk-gutter-half;
+  margin-top: -$gem-guide-border-width;
   margin-bottom: $govuk-gutter-half;
 
   font-family: Consolas, Monaco, "Andale Mono", monospace;
   font-size: 16px;
   line-height: 1.5;
-  border: 1px solid $govuk-border-colour;
+  border: $gem-guide-border-width solid $govuk-border-colour;
 
   &[contenteditable]:hover {
     cursor: text;
@@ -124,7 +122,7 @@
 
 .component-guide-preview {
   padding: ($govuk-gutter * 1.5) $govuk-gutter $govuk-gutter;
-  border: 1px solid $govuk-border-colour;
+  border: $gem-guide-border-width solid $govuk-border-colour;
   position: relative;
 
   &.direction-rtl {
@@ -165,7 +163,7 @@
 .component-guide-preview--violation,
 .component-guide-preview--warning {
   @include govuk-text-colour;
-  margin-top: $govuk-gutter-half;
+  margin-top: -$gem-guide-border-width;
 
   @include govuk-font($size: 19);
 

data/app/assets/stylesheets/govuk_publishing_components/components/_organisation-logo.scss

@@ -65,21 +65,20 @@
   }
 }
 
-// all crest images are currently in whitehall
 @mixin crest($crest) {
-  background: image-url("crests/#{$crest}_13px.png") no-repeat 5px 0;
+  background: image-url("govuk_publishing_components/crests/#{$crest}_13px.png") no-repeat 5px 0;
   background-size: auto 20px;
 
   @include govuk-device-pixel-ratio {
-    background-image: image-url("crests/#{$crest}_13px_x2.png");
+    background-image: image-url("govuk_publishing_components/crests/#{$crest}_13px_x2.png");
   }
 
   @include govuk-media-query($from: tablet) {
-    background: image-url("crests/#{$crest}_18px.png") no-repeat 6px 0;
+    background: image-url("govuk_publishing_components/crests/#{$crest}_18px.png") no-repeat 6px 0;
     background-size: auto 26px;
 
     @include govuk-device-pixel-ratio {
-      background-image: image-url("crests/#{$crest}_18px_x2.png");
+      background-image: image-url("govuk_publishing_components/crests/#{$crest}_18px_x2.png");
     }
   }
 }

data/app/controllers/govuk_publishing_components/application_controller.rb

@@ -5,6 +5,17 @@ module GovukPublishingComponents
     before_action :set_x_frame_options_header
     before_action :set_disable_slimmer_header
 
+    content_security_policy do |p|
+      # don't do anything if the app doesn't have a content security policy
+      next unless p.directives.any?
+
+      # Unfortunately the axe core script uses a dependency that uses eval
+      # see: https://github.com/dequelabs/axe-core/issues/1175
+      # Thus all components shown by govuk_publishing_components need this
+      # enabled
+      p.script_src(*p.script_src, :unsafe_eval)
+    end
+
   private
 
     def set_x_frame_options_header

data/app/views/govuk_publishing_components/component_guide/example.html.erb

@@ -6,10 +6,10 @@
     <div class="component-markdown">
       <%= raw(@component_example.html_description) %>
     </div>
-    <h2 class="component-doc-h2">How to call this example</h2>
-    <%= render partial: "govuk_publishing_components/component_guide/component_doc/call", locals: { component_doc: @component_doc, example: @component_example } %>
-
     <h2 class="component-doc-h2">How it looks</h2>
     <%= render partial: "govuk_publishing_components/component_guide/component_doc/preview", locals: { component_doc: @component_doc, example: @component_example } %>
+
+    <h2 class="component-doc-h2">How to call this example</h2>
+    <%= render partial: "govuk_publishing_components/component_guide/component_doc/call", locals: { component_doc: @component_doc, example: @component_example } %>
   </div>
 </div>

data/app/views/govuk_publishing_components/component_guide/show.html.erb

@@ -16,20 +16,21 @@
           <div class="component-markdown">
             <%= raw(@component_doc.html_body) %>
           </div>
+
+          <p class="govuk-body"><%= link_to "Search for usage of this component on GitHub", @component_doc.github_search_url, class: "govuk-link" %></p>
         </div>
       <% end %>
     </div>
   </div>
 
-  <div class="component-doc">
-    <h2 class="component-doc-h2">How to call this component</h2>
-    <%= render "govuk_publishing_components/component_guide/component_doc/call", component_doc: @component_doc, example: @component_doc.example %>
-    <%= link_to "Search for usage on GitHub", @component_doc.github_search_url, class: "govuk-link" %>
-    <h2 class="component-doc-h2">How it looks</h2>
-  </div>
-
+  <h2 class="component-doc-h2">How it looks
+    <small>(<a href="<%= component_preview_all_path(@component_doc.id) %>" class="govuk-link">preview all</a>)</small>
+  </h2>
   <%= render "govuk_publishing_components/component_guide/component_doc/preview", component_doc: @component_doc, example: @component_doc.example %>
 
+  <h2 class="component-doc-h2">How to call this component</h2>
+  <%= render "govuk_publishing_components/component_guide/component_doc/call", component_doc: @component_doc, example: @component_doc.example %>
+
   <% if @component_doc.govuk_frontend_components.any? %>
     <h2 class="component-doc-h2">GOV.UK Design System</h2>
     <div class="component-markdown">
@@ -56,9 +57,7 @@
 
   <% if @component_doc.other_examples.any? %>
     <div class="examples">
-      <h2 class="component-doc-h2">Other examples
-        <small>(<a href="<%= component_preview_all_path(@component_doc.id) %>" class="govuk-link">preview all</a>)</small>
-      </h2>
+      <h2 class="component-doc-h2">Other examples</h2>
       <% @component_doc.other_examples.each do |example| %>
         <div class="component-example">
           <h3 class="example-title">
@@ -68,8 +67,8 @@
           <div class="component-markdown">
             <%= raw(example.html_description) %>
           </div>
-          <%= render "govuk_publishing_components/component_guide/component_doc/call", component_doc: @component_doc, example: example %>
           <%= render "govuk_publishing_components/component_guide/component_doc/preview", component_doc: @component_doc, example: example %>
+          <%= render "govuk_publishing_components/component_guide/component_doc/call", component_doc: @component_doc, example: example %>
         </div>
       <% end %>
     </div>

data/config/initializers/assets.rb

@@ -26,6 +26,7 @@ Rails.application.config.assets.precompile += %w(
   govuk_publishing_components/chevron-banner-hover.svg
   govuk_publishing_components/chevron-banner-small.svg
   govuk_publishing_components/chevron-banner-small-focus.svg
+  govuk_publishing_components/crests/*.png
 )
 
 # GOV.UK Frontend assets

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '21.3.0'.freeze
+  VERSION = '21.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.3.0
+  version: 21.4.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -321,6 +321,55 @@ files:
 - app/assets/images/govuk_publishing_components/chevron-banner/chevron-banner-small-focus.svg
 - app/assets/images/govuk_publishing_components/chevron-banner/chevron-banner-small.svg
 - app/assets/images/govuk_publishing_components/chevron-banner/chevron-banner.svg
+- app/assets/images/govuk_publishing_components/crests/bis_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/bis_crest_13px_x2-2.png
+- app/assets/images/govuk_publishing_components/crests/bis_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/bis_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/bis_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/coastguard_13px.png
+- app/assets/images/govuk_publishing_components/crests/coastguard_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/coastguard_18px.png
+- app/assets/images/govuk_publishing_components/crests/coastguard_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/dit_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/dit_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/dit_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/dit_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/hmrc_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/hmrc_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/hmrc_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/hmrc_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/ho_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/ho_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/ho_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/ho_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/mod_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/mod_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/mod_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/mod_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/org_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/org_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/org_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/org_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/portcullis_13px.png
+- app/assets/images/govuk_publishing_components/crests/portcullis_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/portcullis_18px.png
+- app/assets/images/govuk_publishing_components/crests/portcullis_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/so_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/so_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/so_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/so_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/ukaea_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/ukaea_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/ukaea_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/ukaea_crest_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/ukho_13px.png
+- app/assets/images/govuk_publishing_components/crests/ukho_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/ukho_18px.png
+- app/assets/images/govuk_publishing_components/crests/ukho_18px_x2.png
+- app/assets/images/govuk_publishing_components/crests/wales_crest_13px.png
+- app/assets/images/govuk_publishing_components/crests/wales_crest_13px_x2.png
+- app/assets/images/govuk_publishing_components/crests/wales_crest_18px.png
+- app/assets/images/govuk_publishing_components/crests/wales_crest_18px_x2.png
 - app/assets/images/govuk_publishing_components/favicon-development.png
 - app/assets/images/govuk_publishing_components/favicon-example.png
 - app/assets/images/govuk_publishing_components/favicon-integration.png