Skip to content

Commit

Permalink
Merge pull request #1003 from nhsuk/reduce-main-wrapper-padding-on-mo…
Browse files Browse the repository at this point in the history
…bile

Reduce the padding on main wrapper on mobile
  • Loading branch information
anandamaryon1 authored Sep 10, 2024
2 parents 82f3e8a + e89fff6 commit e8f9d03
Show file tree
Hide file tree
Showing 168 changed files with 23 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
- Fix Sass deprecation on `mix` function (passing a number without unit) ([PR 995](https://github.com/nhsuk/nhsuk-frontend/pull/995))
- Add nhsukAttributes macro, copied from GOV.UK ([PR 998](https://github.com/nhsuk/nhsuk-frontend/pull/998))
- Change "Contact us" in the footer link examples to "Give us feedback" ([PR 972](https://github.com/nhsuk/nhsuk-frontend/pull/972))
- Adjusted default spacing of back link component. ([PR 964](https://github.com/nhsuk/nhsuk-frontend/pull/964))
- Adjusted default spacing of back link component ([PR 964](https://github.com/nhsuk/nhsuk-frontend/pull/964))
- Reduce main wrapper padding on mobile ([PR 1003](https://github.com/nhsuk/nhsuk-frontend/pull/1003))

## 8.3.0 - 24 July 2024

Expand Down
26 changes: 21 additions & 5 deletions packages/core/objects/_main-wrapper.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,44 @@
*/

@mixin govuk-main-wrapper {
@include nhsuk-responsive-padding(7, "top");
@include nhsuk-responsive-padding(7, "bottom");
@include top-and-bottom();
display: block; /* [1] */
padding-top: nhsuk-spacing(4);
padding-bottom: nhsuk-spacing(4);

@include mq($from: tablet) {
padding-top: nhsuk-spacing(7);
padding-bottom: nhsuk-spacing(7);
}
}

@mixin govuk-main-wrapper--l {
@include nhsuk-responsive-padding(8, "top");
padding-top: nhsuk-spacing(6);

@include mq($from: tablet) {
padding-top: nhsuk-spacing(8);
}
}

@mixin govuk-main-wrapper--s {
@include nhsuk-responsive-padding(5, "bottom");
@include nhsuk-responsive-padding(5, "top");
padding-top: nhsuk-spacing(3);
padding-bottom: nhsuk-spacing(3);

@include mq($from: tablet) {
padding-top: nhsuk-spacing(4);
padding-bottom: nhsuk-spacing(4);
}
}

@include govuk-exports("govuk/objects/main-wrapper") {
.nhsuk-main-wrapper {
@include govuk-main-wrapper;
}

.nhsuk-main-wrapper--l {
@include govuk-main-wrapper--l;
}

.nhsuk-main-wrapper--s {
@include govuk-main-wrapper--s;
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e8f9d03

Please sign in to comment.