diff --git a/app/frontend/styles/_button.scss b/app/frontend/styles/_button.scss index 7dade9268..5975da0cb 100644 --- a/app/frontend/styles/_button.scss +++ b/app/frontend/styles/_button.scss @@ -28,4 +28,4 @@ $app-button-inverse-hover-background-colour: govuk-tint($app-button-inverse-fore color: $app-button-inverse-foreground-colour; background-color: $app-button-inverse-hover-background-colour; box-shadow: inset 0 0 0 2px $govuk-focus-colour; -} \ No newline at end of file +} diff --git a/app/frontend/styles/_document-list.scss b/app/frontend/styles/_document-list.scss index 89c547ef6..c510e52b2 100644 --- a/app/frontend/styles/_document-list.scss +++ b/app/frontend/styles/_document-list.scss @@ -18,11 +18,6 @@ margin: 0 0 govuk-spacing(1); } -.app-document-list__item-metadata { - padding: 0; - margin: 0; -} - .app-document-list__item-description { @include govuk-font($size: 16); margin: govuk-spacing(1) 0; @@ -32,35 +27,5 @@ @include govuk-font($size: 16); color: $govuk-secondary-text-colour; margin: 0; -} -.app-document-list { - list-style: none; padding: 0; } - -.app-document-list__item { - margin-bottom: govuk-spacing(4); - - &:last-child { - border-bottom: 0; - margin-bottom: 0; - padding-bottom: 0; - } -} - -.app-document-list__item-title { - @include govuk-font($size: 16, $weight: "bold"); - margin: 0 0 govuk-spacing(1); -} - -.app-document-list__item-description { - @include govuk-font($size: 16); - margin: govuk-spacing(1) 0; -} - -.app-document-list__item-metadata { - @include govuk-font($size: 16); - color: $govuk-secondary-text-colour; - padding: 0; - margin: 0; -} diff --git a/app/frontend/styles/_filter-layout.scss b/app/frontend/styles/_filter-layout.scss index 5dffc0e67..0dbd1f028 100644 --- a/app/frontend/styles/_filter-layout.scss +++ b/app/frontend/styles/_filter-layout.scss @@ -34,9 +34,7 @@ .app-filter-layout__content { @include govuk-media-query(desktop) { float: right; - max-width: calc( - #{govuk-grid-width("three-quarters")} - #{govuk-spacing(6)} - ); + max-width: calc(#{govuk-grid-width("three-quarters")} - #{govuk-spacing(6)}); width: 100%; } } diff --git a/app/frontend/styles/_filter.scss b/app/frontend/styles/_filter.scss index d98ed5099..2b4f17953 100644 --- a/app/frontend/styles/_filter.scss +++ b/app/frontend/styles/_filter.scss @@ -50,7 +50,7 @@ border: 0; } - &::before { + &:before { background-image: url("../assets/images/icon-cross.svg"); content: ""; display: inline-block; @@ -94,7 +94,7 @@ .govuk-radios__label { @include govuk-font(16); - &::before { + &:before { background-color: govuk-colour("white"); } } diff --git a/app/frontend/styles/_pagination.scss b/app/frontend/styles/_pagination.scss index e44bfae1d..8ac7bd546 100644 --- a/app/frontend/styles/_pagination.scss +++ b/app/frontend/styles/_pagination.scss @@ -1,4 +1,3 @@ - // https://github.com/alphagov/govuk-frontend/blob/add-pagination-prototype/src/govuk/components/pagination/_index.scss .app-pagination { border-top: 1px solid $govuk-border-colour; @@ -117,7 +116,7 @@ } .app-pagination__icon { - fill: currentColor; + fill: currentcolor; } .app-pagination__item--prev .app-pagination__link, diff --git a/app/frontend/styles/_panel.scss b/app/frontend/styles/_panel.scss index 2425e82e4..fa3fb778c 100644 --- a/app/frontend/styles/_panel.scss +++ b/app/frontend/styles/_panel.scss @@ -19,8 +19,8 @@ margin-bottom: 0; } - .govuk-radios__label::before, - & ::after { + .govuk-radios__label:before, + & :after { color: govuk-colour("black"); border-color: govuk-colour("black"); background-color: govuk-colour("white"); diff --git a/app/frontend/styles/_primary-navigation.scss b/app/frontend/styles/_primary-navigation.scss index bdadaa107..e6597ea2b 100644 --- a/app/frontend/styles/_primary-navigation.scss +++ b/app/frontend/styles/_primary-navigation.scss @@ -1,69 +1,69 @@ .app-primary-navigation { - @include govuk-font(19, $weight: bold); - background-color: govuk-colour("light-grey"); - border-bottom: 1px solid $govuk-border-colour; + @include govuk-font(19, $weight: bold); + background-color: govuk-colour("light-grey"); + border-bottom: 1px solid $govuk-border-colour; +} + +.govuk-phase-banner + .app-primary-navigation { + margin-top: -1px; +} + +.app-primary-navigation__list { + @include govuk-clearfix; + left: govuk-spacing(-3); + list-style: none; + margin: 0; + padding: 0; + position: relative; + right: govuk-spacing(-3); + width: calc(100% + #{govuk-spacing(6)}); +} + +.app-primary-navigation__item { + box-sizing: border-box; + display: block; + float: left; + line-height: 50px; + height: 50px; + padding: 0 govuk-spacing(3); + position: relative; +} + +.app-primary-navigation__item--current { + border-bottom: $govuk-border-width-narrow solid $govuk-link-colour; + + &:hover { + border-bottom-color: $govuk-link-hover-colour; } - - .govuk-phase-banner + .app-primary-navigation { - margin-top: -1px; + + &:active { + border-bottom-color: $govuk-link-active-colour; } - - .app-primary-navigation__list { - @include govuk-clearfix; - left: govuk-spacing(-3); - list-style: none; - margin: 0; - padding: 0; - position: relative; - right: govuk-spacing(-3); - width: calc(100% + #{govuk-spacing(6)}); +} + +.app-primary-navigation__item--align-right { + @include govuk-media-query($from: tablet) { + float: right; } - - .app-primary-navigation__item { - box-sizing: border-box; - display: block; - float: left; - line-height: 50px; - height: 50px; - padding: 0 govuk-spacing(3); - position: relative; +} + +.app-primary-navigation__link { + @include govuk-link-common; + @include govuk-link-style-no-visited-state; + @include govuk-link-style-no-underline; + @include govuk-typography-weight-bold; + + // Extend the touch area of the link to the list + &:after { + bottom: 0; + content: ""; + left: 0; + position: absolute; + right: 0; + top: 0; } - - .app-primary-navigation__item--current { - border-bottom: $govuk-border-width-narrow solid $govuk-link-colour; - - &:hover { - border-bottom-color: $govuk-link-hover-colour; - } - - &:active { - border-bottom-color: $govuk-link-active-colour; - } - } - - .app-primary-navigation__item--align-right { - @include govuk-media-query($from: tablet) { - float: right; - } - } - - .app-primary-navigation__link { - @include govuk-link-common; - @include govuk-link-style-no-visited-state; - @include govuk-link-style-no-underline; - @include govuk-typography-weight-bold; - - // Extend the touch area of the link to the list - &:after { - bottom: 0; - content: ""; - left: 0; - position: absolute; - right: 0; - top: 0; - } - } - - .app-primary-navigation__item--current .app-primary-navigation__link:hover { - text-decoration: none; - } \ No newline at end of file +} + +.app-primary-navigation__item--current .app-primary-navigation__link:hover { + text-decoration: none; +} diff --git a/app/frontend/styles/application.scss b/app/frontend/styles/application.scss index a756bbf60..9d1103d56 100644 --- a/app/frontend/styles/application.scss +++ b/app/frontend/styles/application.scss @@ -34,6 +34,7 @@ $govuk-new-link-styles: true; // App utilities .app-\!-colour-muted { + // stylelint-disable declaration-no-important color: $govuk-secondary-text-colour !important; }