diff --git a/app/frontend/styles/application.scss b/app/frontend/styles/application.scss index 84cb508e0..487f2d893 100644 --- a/app/frontend/styles/application.scss +++ b/app/frontend/styles/application.scss @@ -41,7 +41,6 @@ $govuk-breakpoints: ( @import "primary-navigation"; @import "search"; @import "sub-navigation"; -@import "table" // App utilities .app-\!-colour-muted { diff --git a/app/views/case_logs/_log_list.html.erb b/app/views/case_logs/_log_list.html.erb index bf027896c..95dcc870e 100644 --- a/app/views/case_logs/_log_list.html.erb +++ b/app/views/case_logs/_log_list.html.erb @@ -1,6 +1,6 @@
-
+ <%= pagy.count %> total <%= title.downcase %> diff --git a/app/views/organisations/_organisation_list.html.erb b/app/views/organisations/_organisation_list.html.erb index 8e6e443b1..383de6e95 100644 --- a/app/views/organisations/_organisation_list.html.erb +++ b/app/views/organisations/_organisation_list.html.erb @@ -1,10 +1,8 @@ <% content_for :title, title %> <%= govuk_table do |table| %> - <%= table.caption(size: "s", classes: %w[govuk-!-text-align-left govuk-!-margin-top-4 govuk-!-margin-bottom-4]) do |caption| %> - - <%= @pagy.count %> total <%= title.downcase %> - + <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> + <%= @pagy.count %> total <%= title.downcase %>. <% end %> <%= table.head do |head| %> <%= head.row do |row| %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index b7d0d703c..4ed96d2ad 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -11,12 +11,12 @@ <%= render SearchComponent.new(current_user:, label: "Search by name or email address") %> <%= govuk_table do |table| %> - <%= table.caption(classes: %w[app-table__caption]) do |caption| %> + <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> <% if @searched %> - Matches <%= @pagy.count %> of <%= User.count %> total users + Matches <%= @pagy.count %> of <%= User.count %> total users. <% else %> - <%= @pagy.count %> total users + <%= @pagy.count %> total users. <% end %> <% if current_user.support? %> diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index 342c6f36c..94f928a6b 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -460,7 +460,7 @@ RSpec.describe OrganisationsController, type: :request do end it "shows the total organisations count" do - expect(CGI.unescape_html(response.body)).to match("#{total_organisations_count} total organisations") + expect(CGI.unescape_html(response.body)).to match("#{total_organisations_count} total organisations.") end it "has pagination links" do diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index beb81a993..10821961c 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -381,7 +381,7 @@ RSpec.describe UsersController, type: :request do end it "updates the table caption" do - expect(page).to have_content("Matches 1 of 5 total users") + expect(page).to have_content("Matches 1 of 5 total users.") end end @@ -417,7 +417,7 @@ RSpec.describe UsersController, type: :request do end it "updates the table caption" do - expect(page).to have_content("Matches 2 of 5 total users") + expect(page).to have_content("Matches 2 of 5 total users.") end end end @@ -842,7 +842,7 @@ RSpec.describe UsersController, type: :request do end it "updates the table caption" do - expect(page).to have_content("Matches 1 of 4 total users") + expect(page).to have_content("Matches 1 of 4 total users.") end end @@ -881,7 +881,7 @@ RSpec.describe UsersController, type: :request do end it "updates the table caption" do - expect(page).to have_content("Matches 2 of 4 total users") + expect(page).to have_content("Matches 2 of 4 total users.") end end end