govuk_publishing_components 21.13.2 → 21.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b990d9b30f4c8c5d0e6ccf8d1d53b679fe47f8758bd986bd75039588bd02e07b
-  data.tar.gz: 2929d0298a3ecb008ff38217359c9f58ba1ba7ff0b59ec52fe0a8dd043be8a0b
+  metadata.gz: cbd34f0166b0c5c5c38226e23ef1d95fb03fa5a3c06a05f7c2c4e1e62c5f0dbb
+  data.tar.gz: 733069a7303c155a34053a502f2b4ef81f3284bdbb2f8af99420db69f5344083
 SHA512:
-  metadata.gz: c1e7e8480b6a84fc697f546be5bfcbbc2fda606313aba9edb01873a8b0e8af34501d9c3a9fbc3dfc999d1168f351a194a9583a8fba95982cf105ad3b0e5f589d
-  data.tar.gz: 4233bd6739384598708857c82fab71bd5e5aa11364d72d90deb55e2740c798200bf3c9a0ad5b6eb1240330dc9bbb015fd00bbf27e5195247f98d7cced41f6124
+  metadata.gz: 85a76aa59276d5df03d3e8045a47a7f14bb46f8080274e448f2c4ebc3f84a6da4e78bc748e10340693e063165e28e2f294f61f5d228e3f85f6f27f200f825a28
+  data.tar.gz: 6023c90967b99c03f9830989a4d70fc004f938573ac3a40686a9bf48cf3e9e74630b0c38b35b796b1f0d2c80bde30e9cc126a3421775093062250ba83a6a532e

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

@@ -64,11 +64,9 @@
 .gem-c-feedback__prompt-link {
   @include govuk-link-common;
   @include govuk-font(19);
-  margin-left: govuk-spacing(3);
 
   @include govuk-media-query($from: tablet) {
     @include govuk-font(16);
-    float: left; // needed to ensure vertical alignment consistent with prompt-link--wrong
     margin-left: govuk-spacing(2);
   }
 }
@@ -82,20 +80,6 @@
   }
 }
 
-.gem-c-feedback__prompt-link--wrong {
-  display: block;
-  clear: both;
-  margin-top: govuk-spacing(3);
-  margin-left: 0;
-
-  @include govuk-media-query($from: tablet) {
-    float: right;
-    clear: none;
-    margin-top: 0;
-    margin-left: govuk-spacing(2);
-  }
-}
-
 .gem-c-feedback__error-summary {
   margin-bottom: govuk-spacing(3);
   padding: govuk-spacing(3);
@@ -203,3 +187,78 @@
   margin: 0;
   padding: 0;
 }
+
+
+.js-enabled {
+  .gem-c-feedback__js-prompt-questions {
+    @include govuk-media-query($until: tablet) {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(150px, 140));
+      grid-template-rows: repeat(2, auto);
+    }
+  }
+
+  .gem-c-feedback__prompt-question {
+    @include govuk-media-query($until: tablet) {
+      grid-area: 1 / 1;
+    }
+  }
+
+  .gem-c-feedback__option-list {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+
+    @include govuk-media-query($until: tablet) {
+      grid-area: 1 / 1 / 2 / 3;
+      display: grid;
+      grid-template-columns: repeat(2, minmax(140px, 140px));
+      grid-template-rows: repeat(2, auto);
+      // older grid spec
+      grid-row-gap: govuk-spacing(3);
+      // newer grid spec
+      row-gap: govuk-spacing(3); // sass-lint:disable-line no-misspelled-properties
+    }
+  }
+
+  .gem-c-feedback__option-list-item {
+    @include govuk-media-query($from: tablet) {
+      float: left;
+    }
+  }
+
+  .gem-c-feedback__option-list-item--useful {
+    @include govuk-media-query($until: tablet) {
+      display: inline-block;
+      @supports (display: grid) {
+        grid-area: 1 / 2;
+        padding-left: govuk-spacing(3);
+      }
+    }
+  }
+
+  .gem-c-feedback__option-list-item--not-useful {
+    @include govuk-media-query($until: tablet) {
+      display: inline-block;
+      @supports (display: grid) {
+        grid-area: 1 / 2;
+        padding-left: 50px;
+      }
+    }
+  }
+
+  .gem-c-feedback__option-list-item--wrong {
+    @include govuk-media-query($until: tablet) {
+      display: block;
+      margin-top: govuk-spacing(3);
+      @supports (display: grid) {
+        margin-top: 0;
+        grid-area: 2 / 1 / 2 / 3;
+      }
+    }
+
+    @include govuk-media-query($from: tablet) {
+      float: right;
+    }
+  }
+}

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss

@@ -19,7 +19,6 @@
 }
 
 .gem-c-header__logo {
-  white-space: nowrap;
   width: auto;
 }
 

data/app/views/govuk_publishing_components/components/feedback/_yes_no_banner.html.erb

@@ -20,9 +20,9 @@
         Maybe
     <% end %>
     <ul class="gem-c-feedback__option-list">
-      <li class="gem-c-feedback__option-list-item">
+      <li class="gem-c-feedback__option-list-item gem-c-feedback__option-list-item--useful">
         <%= link_to contact_govuk_path, {
-          class: 'gem-c-feedback__prompt-link gem-c-feedback__prompt-link--useful js-page-is-useful',
+          class: 'gem-c-feedback__prompt-link js-page-is-useful',
           data: {
             'track-category' => 'yesNoFeedbackForm',
             'track-action' => 'ffYesClick'
@@ -33,7 +33,7 @@
           Yes <span class="visually-hidden">this page is useful</span>
         <% end %>
       </li>
-      <li class="gem-c-feedback__option-list-item">
+      <li class="gem-c-feedback__option-list-item gem-c-feedback__option-list-item--not-useful">
         <%= link_to contact_govuk_path, {
           class: 'gem-c-feedback__prompt-link js-toggle-form js-page-is-not-useful',
           data: {
@@ -47,9 +47,9 @@
           No <span class="visually-hidden">this page is not useful</span>
         <% end %>
       </li>
-      <li class="gem-c-feedback__option-list-item">
+      <li class="gem-c-feedback__option-list-item gem-c-feedback__option-list-item--wrong">
         <%= link_to contact_govuk_path, {
-          class: 'gem-c-feedback__prompt-link gem-c-feedback__prompt-link--wrong js-toggle-form js-something-is-wrong',
+          class: 'gem-c-feedback__prompt-link js-toggle-form js-something-is-wrong',
           data: {
             'track-category' => 'Onsite Feedback',
             'track-action' => 'GOV.UK Open Form'

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '21.13.2'.freeze
+  VERSION = '21.13.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.13.2
+  version: 21.13.3
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters