From 97a150829500c83366f12f503168ad91ee573ba6 Mon Sep 17 00:00:00 2001 From: Dave House Date: Wed, 3 Jan 2018 09:52:21 +0000 Subject: [PATCH 1/2] Add adjecent styles for headings after lists --- src/globals/scss/core/_typography.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/globals/scss/core/_typography.scss b/src/globals/scss/core/_typography.scss index 5a90f91511..fab11f9a5a 100644 --- a/src/globals/scss/core/_typography.scss +++ b/src/globals/scss/core/_typography.scss @@ -139,14 +139,17 @@ } .govuk-body-m + .govuk-heading-l, - .govuk-body-s + .govuk-heading-l { + .govuk-body-s + .govuk-heading-l, + .govuk-list + .govuk-heading-l { @include govuk-responsive-padding($govuk-spacing-responsive-4, "top"); } .govuk-body-m + .govuk-heading-m, .govuk-body-s + .govuk-heading-m, + .govuk-list + .govuk-heading-m, .govuk-body-m + .govuk-heading-s, - .govuk-body-s + .govuk-heading-s { + .govuk-body-s + .govuk-heading-s, + .govuk-list + .govuk-heading-s { padding-top: $govuk-spacing-scale-1; @include mq($from: tablet) { From a023e04909cfce23f6961b158ab0fa94614cc1f4 Mon Sep 17 00:00:00 2001 From: Dave House Date: Wed, 3 Jan 2018 12:24:04 +0000 Subject: [PATCH 2/2] Add adjacent sibling examples to review app --- src/views/examples/typography/index.njk | 78 +++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/src/views/examples/typography/index.njk b/src/views/examples/typography/index.njk index a7db88d041..071ac33b7b 100644 --- a/src/views/examples/typography/index.njk +++ b/src/views/examples/typography/index.njk @@ -269,6 +269,84 @@

You’ll receive your badge within 4 weeks or you’ll be contacted if you need to provide more information.

+ +
+

Adjacent siblings

+ +

govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body

+ +

govuk-heading-l govuk-heading-l govuk-heading-l govuk-heading-l govuk-heading-l

+ +

govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body

+ +

govuk-heading-l govuk-heading-l govuk-heading-l govuk-heading-l govuk-heading-l

+ +

govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body

+ +

govuk-heading-m govuk-heading-m govuk-heading-m govuk-heading-m govuk-heading-m

+ +

govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body govuk-body

+ +

govuk-heading-s govuk-heading-s govuk-heading-s govuk-heading-s govuk-heading-s

+ +
    +
  • List item
  • +
  • List item
  • +
  • List item
  • +
  • List item
  • +
+ +

govuk-heading-l govuk-heading-l govuk-heading-l govuk-heading-l govuk-heading-l

+ +
    +
  • List item
  • +
  • List item
  • +
  • List item
  • +
  • List item
  • +
+ +

govuk-heading-m govuk-heading-m govuk-heading-m govuk-heading-m govuk-heading-m

+ +
    +
  • List item
  • +
  • List item
  • +
  • List item
  • +
  • List item
  • +
+ +

govuk-heading-s govuk-heading-s govuk-heading-s govuk-heading-s govuk-heading-s

+ + +
    +
  1. List item
  2. +
  3. List item
  4. +
  5. List item
  6. +
  7. List item
  8. +
+ +

govuk-heading-l govuk-heading-l govuk-heading-l govuk-heading-l govuk-heading-l

+ +
    +
  1. List item
  2. +
  3. List item
  4. +
  5. List item
  6. +
  7. List item
  8. +
+ +

govuk-heading-m govuk-heading-m govuk-heading-m govuk-heading-m govuk-heading-m

+ +
    +
  1. List item
  2. +
  3. List item
  4. +
  5. List item
  6. +
  7. List item
  8. +
+ +

govuk-heading-s govuk-heading-s govuk-heading-s govuk-heading-s govuk-heading-s

+ +
+ +