From 92261d20e77d356c11cadb6ab5779cd9a75e82a6 Mon Sep 17 00:00:00 2001 From: Celia Collins Date: Tue, 5 Mar 2024 13:41:44 +0000 Subject: [PATCH 1/3] Use govuk-task-list and markup correctly --- app/assets/stylesheets/application.scss | 5 +- app/assets/stylesheets/task-list.scss | 68 ------------------- ...onal_document_validation_requests.html.erb | 24 ++++--- .../_change_request_state.html.erb | 12 ++-- ...iption_change_validation_requests.html.erb | 24 ++++--- .../_fee_change_validation_requests.html.erb | 23 ++++--- ..._other_change_validation_requests.html.erb | 24 ++++--- ...p_certificate_validation_requests.html.erb | 23 ++++--- ...ent_condition_validation_requests.html.erb | 24 ++++--- ...undary_change_validation_requests.html.erb | 24 ++++--- ...ment_document_validation_requests.html.erb | 24 ++++--- app/views/validation_requests/index.html.erb | 4 +- 12 files changed, 114 insertions(+), 165 deletions(-) delete mode 100644 app/assets/stylesheets/task-list.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7ad79ca9..6915d9cc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -4,7 +4,6 @@ $govuk-font-family: open-sans, sans-serif; @import "accessible-autocomplete/dist/accessible-autocomplete.min"; @import "components/buttons"; @import "components/flashes"; -@import "task-list"; .image-border { width: 276px; @@ -30,3 +29,7 @@ $govuk-font-family: open-sans, sans-serif; .govuk-tag { max-width: none; } + +.govuk-list--number ::marker { + font-weight: bold; +} diff --git a/app/assets/stylesheets/task-list.scss b/app/assets/stylesheets/task-list.scss deleted file mode 100644 index 8cfe82d9..00000000 --- a/app/assets/stylesheets/task-list.scss +++ /dev/null @@ -1,68 +0,0 @@ -/* ========================================================================== - #TASK LIST - ========================================================================== */ - -.moj-task-list { - list-style-type: none; - padding-left: 0; - margin-top: 0; - margin-bottom: 0; - @include govuk-media-query($from: tablet) { - min-width: 550px; - } -} - -.moj-task-list__section { - display: table; - @include govuk-font($size:24, $weight: bold); -} - -.moj-task-list__section-number { - display: table-cell; - - @include govuk-media-query($from: tablet) { - min-width: govuk-spacing(6); - padding-right: 0; - } -} - -.moj-task-list__items { - @include govuk-font($size: 19); - @include govuk-responsive-margin(9, "bottom"); - list-style: none; - padding-left: 0; - @include govuk-media-query($from: tablet) { - padding-left: govuk-spacing(6); - } -} - -.moj-task-list__item { - border-bottom: 1px solid $govuk-border-colour; - margin-bottom: 0 !important; - padding-top: govuk-spacing(2); - padding-bottom: govuk-spacing(2); - @include govuk-clearfix; -} - -.moj-task-list__item:first-child { - border-top: 1px solid $govuk-border-colour; -} - -.moj-task-list__task-name { - display: block; - @include govuk-media-query($from: 450px) { - float: left; - width: 75%; - } -} - -.moj-task-list__task-completed { - margin-top: govuk-spacing(2); - margin-bottom: govuk-spacing(1); - - @include govuk-media-query($from: 450px) { - float: right; - margin-top: 0; - margin-bottom: 0; - } -} diff --git a/app/views/validation_requests/_additional_document_validation_requests.html.erb b/app/views/validation_requests/_additional_document_validation_requests.html.erb index 61acf9d3..f931c772 100644 --- a/app/views/validation_requests/_additional_document_validation_requests.html.erb +++ b/app/views/validation_requests/_additional_document_validation_requests.html.erb @@ -1,15 +1,17 @@ -
  • -

    - <%= count_total_requests(@validation_requests, "additional_document_validation_requests") %> Provide new or missing documents -

    -