Replace $gutter with govuk-spacing function

Replaced `$gutter` and similar variables such as `$gutter-half` with the
`govuk-spacing()` static spacing function. This uses `govuk-spacing()`
instead of `$govuk-gutter` because `$govuk-gutter` should only be used
for the gaps in between grid columns and we were mostly using `$gutter`
to add more space around elements.

There are other places in the SCSS files where we had hardcoded a
measurement in px which could be replaced with `govuk-spacing`, but this
commit only replaces the existing uses of `$gutter`.
This commit is contained in:
Katie Smith
2020-02-21 13:21:44 +00:00
parent a85f7fa2c1
commit bc83ff6c09
35 changed files with 139 additions and 139 deletions

View File

@@ -5,8 +5,8 @@
@include bold-19;
color: $button-colour;
display: block;
padding: $gutter-half;
margin: $gutter-half 0 $gutter 0;
padding: govuk-spacing(3);
margin: govuk-spacing(3) 0 govuk-spacing(6) 0;
text-align: left;
position: relative;
clear: both;
@@ -28,11 +28,11 @@
%banner-with-tick,
.banner-with-tick {
padding: $gutter-half ($gutter + $gutter-half);
padding: govuk-spacing(3) (govuk-spacing(6) + govuk-spacing(3));
background-image: file-url('tick.png');
background-size: 19px;
background-repeat: no-repeat;
background-position: $gutter-half $gutter-half;
background-position: govuk-spacing(3) govuk-spacing(3);
}
@@ -68,7 +68,7 @@
color: $white;
margin-top: 10px;
margin-bottom: 0;
padding: $gutter;
padding: govuk-spacing(6);
height: 425px;
overflow: hidden;
box-shadow: inset 0 -1em 1.6em 0 rgba(0, 0, 0, 0.05);
@@ -81,14 +81,14 @@
p {
margin-top: 0;
margin-bottom: $gutter;
margin-bottom: govuk-spacing(6);
&:last-child {
margin-bottom: 0;
}
& + p {
margin-top: -$gutter-half;
margin-top: -govuk-spacing(3);
}
}
@@ -98,7 +98,7 @@
font-weight: bold;
display: block;
padding: 0 ;
margin: 0 0 $gutter 0;
margin: 0 0 govuk-spacing(6) 0;
&:link,
&:visited {
@@ -133,15 +133,15 @@
display: flex;
align-items: baseline;
flex-wrap: wrap;
padding: ($gutter-half - 1px) 0 ($gutter-half + 1px) 0;
padding: (govuk-spacing(3) - 1px) 0 (govuk-spacing(3) + 1px) 0;
border-top: 1px solid $border-colour;
border-bottom: 1px solid $border-colour;
margin-bottom: $gutter;
margin-bottom: govuk-spacing(6);
text-decoration: none;
&:focus {
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
border-bottom: 1px solid transparent;
}
&-count,
@@ -175,7 +175,7 @@
}
& + .banner-dashboard {
margin-top: -$gutter;
margin-top: -govuk-spacing(6);
border-top: none;
}
}