Skip to content

Commit

Permalink
Merge pull request #778 from alphagov/remove-prose-scope
Browse files Browse the repository at this point in the history
Remove prose scope
  • Loading branch information
Jani Kraner authored Jun 13, 2018
2 parents 9fd1798 + 177c7ac commit 86da116
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 198 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,19 @@ Note: We're not following semantic versioning yet, we are going to talk about th
has been updated to make it circular without the need for another class.

([PR #782](https://github.com/alphagov/govuk-frontend/pull/782))
- Removal of `govuk-prose-scope`
We don't have confidence that the prose scope is well understood –
without further research / better documentation it's safer to remove it for now.

If you are currently using prose-scope, you should revert to applying classes to
individual headings, lists and hr elements.
In version [0.0.29-alpha](https://github.com/alphagov/govuk-frontend/releases/tag/v0.0.29-alpha)
release we have added the option to enable global link and paragraph styles.

If you're using a recent version of the Private Beta Prototype kit,
this is enabled by default.

([PR #778](https://github.com/alphagov/govuk-frontend/pull/778))

🔧 Fixes:

Expand Down
16 changes: 0 additions & 16 deletions app/__tests__/app.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ const requestParamsExampleLinks = {
}
}

const requestParamsExampleProseScope = {
url: `http://localhost:${PORT}/examples/prose-scope`,
headers: {
'Content-Type': 'text/plain'
}
}

const requestParamsExampleTypography = {
url: `http://localhost:${PORT}/examples/typography`,
headers: {
Expand Down Expand Up @@ -148,15 +141,6 @@ describe('frontend app', () => {
})
})

describe('prose scope examples', () => {
it('should resolve with a http status code of 200', done => {
request.get(requestParamsExampleProseScope, (err, res) => {
expect(res.statusCode).toEqual(200)
done(err)
})
})
})

describe('template examples', () => {
describe('default', () => {
it('should resolve with a http status code of 200', done => {
Expand Down
103 changes: 0 additions & 103 deletions app/views/examples/prose-scope/index.njk

This file was deleted.

1 change: 0 additions & 1 deletion src/core/_all.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
@import "lists";
@import "template";
@import "typography";
@import "prose-scope";
@import "section-break";
@import "global-styles";
4 changes: 0 additions & 4 deletions src/core/_links.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
@include govuk-exports("govuk/core/links") {

// We use a placeholder class here so that we can @extend from the prose scope
// without also applying every other occurrence of the .govuk-link selector to
// the prose scope.

%govuk-link {
@include govuk-link-common;
@include govuk-link-style-default;
Expand Down
4 changes: 0 additions & 4 deletions src/core/_lists.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
@include govuk-exports("govuk/core/lists") {

// We use a placeholder class here so that we can @extend from the prose scope
// without also applying every other occurrence of the .govuk-list selector to
// the prose scope.

%govuk-list {
@include govuk-font($size: 19);
@include govuk-text-colour;
Expand Down
57 changes: 0 additions & 57 deletions src/core/_prose-scope.scss

This file was deleted.

2 changes: 0 additions & 2 deletions src/core/_section-break.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@include govuk-exports("govuk/core/section-break") {

// We use placeholder classes here so that we can @extend from the prose scope

%govuk-section-break {
margin: 0;
border: 0;
Expand Down
11 changes: 0 additions & 11 deletions src/core/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
@include govuk-exports("govuk/core/typography") {

// We use placeholder classes here so that we can @extend from the prose scope
// without also applying every other occurrence of the typography selectors to
// the prose scope.

// Headings

%govuk-heading-xl {
Expand Down Expand Up @@ -63,9 +59,6 @@
}

// Captions to be used inside headings
//
// As these are not used in the prose scope, there is no need to use
// placeholder classes.

.govuk-caption-xl {
@include govuk-font($size: 27);
Expand Down Expand Up @@ -162,10 +155,6 @@
}

// Contextual adjustments
//
// Because these adjustments are made to the placeholder classes, they will
// be inherited by the prose scope as well.

// Add top padding to headings that appear directly after paragraphs.

%govuk-body-l + %govuk-heading-l {
Expand Down

0 comments on commit 86da116

Please sign in to comment.