Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sass warnings #3323

Merged
merged 1 commit into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/assets/stylesheets/components/_banner.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@import "govuk_publishing_components/individual_component_support";

.app-c-banner {
@include responsive-bottom-margin;
@include govuk-font(19);
direction: ltr;
background: $govuk-brand-colour;
color: govuk-colour("white");
padding: govuk-spacing(3);
clear: both;
@include responsive-bottom-margin;
@include govuk-font(19);

@include govuk-media-query($from: tablet) {
padding: govuk-spacing(4) govuk-spacing(6);
Expand All @@ -30,13 +30,13 @@
}

.app-c-banner__title {
@include govuk-font(27, $weight: bold);
margin-bottom: govuk-spacing(2);
@include govuk-font(27, $weight: bold);
}

.app-c-banner__desc {
@include govuk-font(19);
// Ensure the text has a line-length of around 60 characters
max-width: 30em;
padding-top: govuk-spacing(2);
@include govuk-font(19);
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/_download-link.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

.app-c-download-link {
display: inline-block;
@include govuk-font(19, $weight: bold);
margin-top: govuk-spacing(3);
margin-bottom: govuk-spacing(3);
@include govuk-font(19, $weight: bold);

@include govuk-media-query($from: tablet) {
margin-top: govuk-spacing(6);
Expand Down
5 changes: 2 additions & 3 deletions app/assets/stylesheets/components/_figure.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
@import "govuk_publishing_components/individual_component_support";

.app-c-figure {
@include govuk-clearfix;

border-top: 1px solid $govuk-border-colour;
padding-top: govuk-spacing(3);
margin: 0;
margin-bottom: govuk-spacing(8);
@include govuk-clearfix;

@include govuk-media-query($until: tablet) {
margin-bottom: govuk-spacing(6);
Expand Down Expand Up @@ -41,7 +40,7 @@
}

.app-c-figure__figcaption-text {
@include govuk-font(16);
margin: 0;
margin-bottom: govuk-spacing(2);
@include govuk-font(16);
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/helpers/_parts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
}

.part-title {
@include govuk-font(27, $weight: bold);
margin-bottom: govuk-spacing(3);
margin-top: govuk-spacing(3);
@include govuk-font(27, $weight: bold);

@include govuk-media-query($from: tablet) {
margin-bottom: govuk-spacing(4);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// roll out the combination of metadata + logo across
// formats so they may ultimately become component styles.
.metadata-logo-wrapper {
@include govuk-clearfix;
border-top: 1px solid $govuk-border-colour;
margin-left: govuk-spacing(3);
margin-right: govuk-spacing(3);
@include govuk-clearfix;

.metadata-column {
padding-left: 0;
Expand Down
5 changes: 2 additions & 3 deletions app/assets/stylesheets/modules/_notice.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
.notice {
clear: both;
@include responsive-bottom-margin;
padding: govuk-spacing(3);

border: 5px solid $govuk-brand-colour;
@include responsive-bottom-margin;

@include govuk-media-query($from: tablet) {
padding: govuk-spacing(4);
}

&__title {
@include govuk-font(36, $weight: bold);
margin-bottom: govuk-spacing(2);
@include govuk-font(36, $weight: bold);
}

&__description {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/views/_html-publication.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
}

.publication-header__last-changed {
@include govuk-font(19);
margin-top: govuk-spacing(3);
@include govuk-font(19);
}

.contents-list-container {
Expand Down
12 changes: 5 additions & 7 deletions app/assets/stylesheets/views/_manual.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
}

.manuals-header {
@include govuk-font(16);
@include govuk-clearfix;

background: $govuk-brand-colour;
color: govuk-colour("white");
margin: 0;
padding-bottom: govuk-spacing(6);
padding-top: govuk-spacing(6);
@include govuk-font(16);
@include govuk-clearfix;

@include govuk-media-query($from: tablet) {
padding: govuk-spacing(6) govuk-spacing(3);
Expand All @@ -23,8 +22,8 @@
}

h1 {
@include govuk-font(36, $weight: bold);
padding: 0 0 govuk-spacing(3);
@include govuk-font(36, $weight: bold);

@include govuk-media-query($from: tablet) {
padding: 0 0 govuk-spacing(6);
Expand Down Expand Up @@ -54,11 +53,10 @@
}

.section-list-item {
@include govuk-font(19);

border-top: 1px solid $govuk-border-colour;
cursor: pointer;
list-style: none;
@include govuk-font(19);

&:hover {
background-color: govuk-colour("light-grey");
Expand All @@ -83,9 +81,9 @@
}

.subsection-title-text {
display: block;
@include govuk-typography-weight-bold;
@include govuk-link-decoration;
display: block;
}

.subsection-summary {
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/views/_travel-advice.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
// TODO: Remove this when components can accept variable unidirectional spacing,
// the component above should have a bigger margin-bottom.
.map {
@include responsive-bottom-margin;

margin-top: govuk-spacing(6);
@include responsive-bottom-margin;

.map-image {
max-width: 100%;
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/views/_worldwide-organisation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
margin-top: govuk-spacing(2);

dl {
margin: 0;
@include govuk-text-colour;
@include govuk-font($size: 16);
@include govuk-responsive-margin(4, "bottom");
Expand All @@ -38,8 +39,6 @@
grid-gap: govuk-spacing(2);
}

margin: 0;

dt,
dd {
display: block;
Expand Down
Loading