From 761a8754f35d13c860d68236b11dd252ce630e26 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Thu, 31 Mar 2022 13:57:03 +0100 Subject: [PATCH] Update style namespace --- app/frontend/styles/_pagination.scss | 43 ++++++++++++++-------------- app/views/pagy/_nav.html.erb | 24 ++++++++-------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/app/frontend/styles/_pagination.scss b/app/frontend/styles/_pagination.scss index 39b3aee4e..e44bfae1d 100644 --- a/app/frontend/styles/_pagination.scss +++ b/app/frontend/styles/_pagination.scss @@ -1,5 +1,6 @@ + // https://github.com/alphagov/govuk-frontend/blob/add-pagination-prototype/src/govuk/components/pagination/_index.scss -.govuk-pagination { +.app-pagination { border-top: 1px solid $govuk-border-colour; margin-top: govuk-spacing(2); padding-top: govuk-spacing(2); @@ -20,7 +21,7 @@ } } -.govuk-pagination__list { +.app-pagination__list { margin: 0 govuk-spacing(-3); padding: 0; list-style: none; @@ -31,7 +32,7 @@ } } -.govuk-pagination__results { +.app-pagination__results { @include govuk-font(19); margin-top: 0; margin-bottom: govuk-spacing(4); @@ -42,7 +43,7 @@ } } -.govuk-pagination__item { +.app-pagination__item { @include govuk-font(19); display: inline-block; margin-bottom: govuk-spacing(4); @@ -54,19 +55,19 @@ } // Only show previous, next, first, last and current items on mobile -.govuk-pagination__item--current, -.govuk-pagination__item--divider, -.govuk-pagination__item--prev, -.govuk-pagination__item--next, -.govuk-pagination__item:nth-child(2), -.govuk-pagination__item:nth-last-child(2) { +.app-pagination__item--current, +.app-pagination__item--divider, +.app-pagination__item--prev, +.app-pagination__item--next, +.app-pagination__item:nth-child(2), +.app-pagination__item:nth-last-child(2) { @include govuk-media-query($until: tablet) { display: inline-block; } } -.govuk-pagination__item--current, -.govuk-pagination__item--divider { +.app-pagination__item--current, +.app-pagination__item--divider { box-sizing: border-box; font-weight: bold; min-width: govuk-spacing(8); @@ -75,7 +76,7 @@ text-align: center; } -.govuk-pagination__item--divider { +.app-pagination__item--divider { margin: 0 govuk-spacing(-4); padding-right: 0; padding-left: 0; @@ -83,7 +84,7 @@ pointer-events: none; } -.govuk-pagination__link { +.app-pagination__link { @include govuk-link-common; @include govuk-link-style-no-underline; box-sizing: border-box; @@ -94,14 +95,14 @@ padding: govuk-spacing(2); text-align: center; - .govuk-pagination__link-label { + .app-pagination__link-label { @include govuk-font($size: 16, $weight: "regular"); display: block; padding-left: 32px; text-decoration: underline; } - &:hover .govuk-pagination__link-label { + &:hover .app-pagination__link-label { @include govuk-link-hover-decoration; } @@ -115,20 +116,20 @@ } } -.govuk-pagination__icon { +.app-pagination__icon { fill: currentColor; } -.govuk-pagination__item--prev .govuk-pagination__link, -.govuk-pagination__item--next .govuk-pagination__link { +.app-pagination__item--prev .app-pagination__link, +.app-pagination__item--next .app-pagination__link { padding: govuk-spacing(2) govuk-spacing(3); font-weight: bold; } -.govuk-pagination__item--prev .govuk-pagination__icon { +.app-pagination__item--prev .app-pagination__icon { margin-right: govuk-spacing(2); } -.govuk-pagination__item--next .govuk-pagination__icon { +.app-pagination__item--next .app-pagination__icon { margin-left: govuk-spacing(2); } diff --git a/app/views/pagy/_nav.html.erb b/app/views/pagy/_nav.html.erb index bf09380db..1dda448d2 100644 --- a/app/views/pagy/_nav.html.erb +++ b/app/views/pagy/_nav.html.erb @@ -1,14 +1,14 @@ <% link = pagy_link_proc(pagy) -%> <% if pagy.pages > 1 %> -