diff --git a/CHANGELOG.md b/CHANGELOG.md index c7df45662d..e449f29c23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ New features: - The responsive spacing and typography mixins will now throw an error if you try to use them with anything other than a spacing or font map respectively. (PR [#447](https://github.com/alphagov/govuk-frontend/pull/447)) +- Add thematic break to typography and prose scope. This class is added to an + `
`, adds margin (xl, l and m). There is also an option to make the `
` + border visible or invisible. (PR [#483](https://github.com/alphagov/govuk-frontend/pull/483)) Fixes: diff --git a/app/views/examples/prose-scope/index.njk b/app/views/examples/prose-scope/index.njk index 2eb166702a..4b5cdeecf6 100644 --- a/app/views/examples/prose-scope/index.njk +++ b/app/views/examples/prose-scope/index.njk @@ -72,6 +72,16 @@
  • This is the third and final item in the ordered list.
  • +
    + +

    An H2 after a thematic break

    + +

    + A paragraph. This includes even more text to give a good representation + of a more average length paragraph. That way you can see more than one + line wrapping. +

    + diff --git a/app/views/examples/typography/index.njk b/app/views/examples/typography/index.njk index 7298fecef4..69fe31bb73 100644 --- a/app/views/examples/typography/index.njk +++ b/app/views/examples/typography/index.njk @@ -418,6 +418,88 @@ +
    +

    Section breaks - Not-visible

    + +

    Topic A1

    + +

    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-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

    + +

    Topic A2

    + +

    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-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

    + +
    + +

    Topic B (govuk-section-break--xl above)

    + +

    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-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

    + +
    + +

    Topic C (govuk-section-break--l above)

    + +

    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-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

    + +
    + +

    Topic D (govuk-section-break--m above)

    + +

    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-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

    + +
    + +
    +

    Section breaks - Visible

    + +

    Topic A1

    + +

    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-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

    + +

    Topic A2

    + +

    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-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

    + +
    + +

    Topic B (govuk-section-break--xl above)

    + +

    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-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

    + +
    + +

    Topic C (govuk-section-break--l above)

    + +

    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-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

    + +
    + +

    Topic D (govuk-section-break--m above)

    + +

    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-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

    + +
    + diff --git a/src/globals/scss/_common.scss b/src/globals/scss/_common.scss index 0af47c5f8d..2d6e62b6d8 100644 --- a/src/globals/scss/_common.scss +++ b/src/globals/scss/_common.scss @@ -38,6 +38,7 @@ @import "core/lists"; @import "core/typography"; @import "core/prose-scope"; +@import "core/section-break"; // Objects @import "objects/grid"; diff --git a/src/globals/scss/core/_prose-scope.scss b/src/globals/scss/core/_prose-scope.scss index cdd12e7198..b6b8af8a8d 100644 --- a/src/globals/scss/core/_prose-scope.scss +++ b/src/globals/scss/core/_prose-scope.scss @@ -48,5 +48,10 @@ a { @extend .govuk-link; } + + hr { + @extend .govuk-section-break__visible; + @extend .govuk-section-break--xl; + } } } diff --git a/src/globals/scss/core/_section-break.scss b/src/globals/scss/core/_section-break.scss new file mode 100644 index 0000000000..2051a5befe --- /dev/null +++ b/src/globals/scss/core/_section-break.scss @@ -0,0 +1,27 @@ +@include exports("section-break") { + + .govuk-section-break { + margin: 0; + border: 0; + } + + .govuk-section-break--xl { + @include govuk-responsive-margin($govuk-spacing-responsive-8, "top"); + @include govuk-responsive-margin($govuk-spacing-responsive-8, "bottom"); + } + + .govuk-section-break--l { + @include govuk-responsive-margin($govuk-spacing-responsive-6, "top"); + @include govuk-responsive-margin($govuk-spacing-responsive-6, "bottom"); + } + + .govuk-section-break--m { + @include govuk-responsive-margin($govuk-spacing-responsive-4, "top"); + @include govuk-responsive-margin($govuk-spacing-responsive-4, "bottom"); + } + + .govuk-section-break__visible { + border: 1px solid $govuk-border-colour; + } + +}