darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-26 17:24:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace $gutter with govuk-spacing function

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/views/api.scss
View File

@@ -18,7 +18,7 @@
&__heading {
display: block;
margin-bottom: $gutter-half;
margin-bottom: govuk-spacing(3);
&::before {
top: -1.3em;

10
app/assets/stylesheets/views/dashboard.scss
View File

@@ -5,14 +5,14 @@
}
> .heading-medium:first-of-type {
margin-top: $gutter-half;
margin-top: govuk-spacing(3);
}
}
.keyline-block {
border-top: 1px solid $border-colour;
padding-top: $gutter-half;
padding-top: govuk-spacing(3);
}
.spark-bar {
@@ -21,8 +21,8 @@
box-sizing: border-box;
display: block;
width: 100%;
margin-bottom: $gutter-half;
height: $gutter-half;
margin-bottom: govuk-spacing(3);
height: govuk-spacing(3);
color: $text-colour;
text-align: left;
@@ -92,5 +92,5 @@
.align-with-message-body {
display: block;
margin-top: $gutter * 5 / 6;
margin-top: govuk-spacing(5);
}

6
app/assets/stylesheets/views/get_started.scss
View File

@@ -5,8 +5,8 @@
&__item {
counter-increment: get-started-counter;
padding: 0 0 0 $gutter + 5px;
margin: ($gutter * 1.67) 0 0 0;
padding: 0 0 0 govuk-spacing(6) + 5px;
margin: govuk-spacing(8) 0 0 0;
position: relative;
&:before {
@@ -26,7 +26,7 @@
&__heading {
@include bold-24;
display: inline-block;
margin: 5px 0 $gutter-half 0;
margin: 5px 0 govuk-spacing(3) 0;
}
}

6
app/assets/stylesheets/views/history.scss
View File

@@ -1,13 +1,13 @@
$item-top-padding: $gutter-half;
$item-top-padding: govuk-spacing(3);
.history-list {
@include core-19;
margin-bottom: $gutter;
margin-bottom: govuk-spacing(6);
&-item {
padding: $item-top-padding 0 $gutter-half 0;
padding: $item-top-padding 0 govuk-spacing(3) 0;
border-top: 1px solid $border-colour;
position: relative;

2
app/assets/stylesheets/views/notification.scss
View File

@@ -2,7 +2,7 @@
@include core-16;
color: $secondary-text-colour;
margin-top: -$gutter-half;
margin-top: -govuk-spacing(3);
&.error {

16
app/assets/stylesheets/views/product-page.scss
View File

@@ -11,8 +11,8 @@ $button-shadow-size: $govuk-border-width-form-element;
// We need the `<main>` section to be above it, like the default order, so when we apply the
// negative margin-top it overlaps the theme bar at the bottom of the header
position: relative;
margin: -10px 0 $gutter * 1.5 0;
padding: 0 0 $gutter * 2 0;
margin: -10px 0 govuk-spacing(6) * 1.5 0;
padding: 0 0 govuk-spacing(9) 0;
background: $product-page-blue;
color: $white;
@@ -31,12 +31,12 @@ $button-shadow-size: $govuk-border-width-form-element;
h1 {
@include bold-48;
margin: 20px 0 $gutter 0;
margin: 20px 0 govuk-spacing(6) 0;
}
p {
@include core-24;
margin: $gutter-half 0 $gutter;
margin: govuk-spacing(3) 0 govuk-spacing(6);
}
.govuk-link {
@@ -58,21 +58,21 @@ $button-shadow-size: $govuk-border-width-form-element;
&-section {
@include govuk-width-container;
margin-bottom: $gutter-half;
margin-bottom: govuk-spacing(3);
h2 {
@include bold-27;
margin: 0 0 $gutter;
margin: 0 0 govuk-spacing(6);
}
.with-keyline {
border-top: 1px solid $border-colour;
padding: $gutter * 1.5 0 0 0;
padding: govuk-spacing(6) * 1.5 0 0 0;
}
img {
width: 100%;
margin: 0 0 $gutter * 1.5 0;
margin: 0 0 govuk-spacing(6) * 1.5 0;
}
}

2
app/assets/stylesheets/views/template.scss
View File

@@ -9,7 +9,7 @@
position: absolute;
background: $link-colour;
color: $white;
padding: 10px $gutter-half;
padding: 10px govuk-spacing(3);
z-index: 10000;
&:link, &:visited {

8
app/assets/stylesheets/views/users.scss
View File

@@ -1,19 +1,19 @@
$item-top-padding: $gutter-half;
$item-top-padding: govuk-spacing(3);
.user-list {
@include core-19;
margin-bottom: $gutter;
margin-bottom: govuk-spacing(6);
&-item {
padding: $item-top-padding 150px $gutter-half 0;
padding: $item-top-padding 150px govuk-spacing(3) 0;
border-top: 1px solid $border-colour;
position: relative;
h3 {
padding-right: $gutter-half;
padding-right: govuk-spacing(3);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;