Skip to content

Commit

Permalink
Merge pull request #1893 from DFE-Digital/upgrade-govuk-frontend
Browse files Browse the repository at this point in the history
Upgrade GOV.UK Frontend
  • Loading branch information
thomasleese authored Apr 25, 2024
2 parents 671d466 + 3a4cedc commit 74b292c
Show file tree
Hide file tree
Showing 80 changed files with 516 additions and 684 deletions.
42 changes: 21 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ GEM
email_address (0.2.4)
simpleidn
erubi (1.12.0)
et-orbi (1.2.7)
et-orbi (1.2.11)
tzinfo
factory_bot (6.4.5)
factory_bot (6.4.6)
activesupport (>= 5.0.0)
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
Expand Down Expand Up @@ -223,8 +223,8 @@ GEM
webrick (~> 1.7)
websocket-driver (>= 0.6, < 0.8)
ffi (1.16.3)
fugit (1.9.0)
et-orbi (~> 1, >= 1.2.7)
fugit (1.11.0)
et-orbi (~> 1, >= 1.2.11)
raabro (~> 1.4)
globalid (1.2.1)
activesupport (>= 6.1)
Expand Down Expand Up @@ -258,11 +258,11 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
govuk-components (4.1.2)
govuk-components (5.3.2)
html-attributes-utils (~> 1.0.0, >= 1.0.0)
pagy (~> 6.0)
view_component (>= 3.3, < 3.7)
govuk_design_system_formbuilder (4.1.1)
pagy (>= 6, < 8)
view_component (>= 3.9, < 3.12)
govuk_design_system_formbuilder (5.3.3)
actionview (>= 6.1)
activemodel (>= 6.1)
activesupport (>= 6.1)
Expand All @@ -289,7 +289,7 @@ GEM
reline (>= 0.4.2)
jsbundling-rails (1.3.0)
railties (>= 6.0.0)
json (2.7.1)
json (2.7.2)
jwt (2.8.1)
base64
language_server-protocol (3.17.0.3)
Expand All @@ -309,9 +309,9 @@ GEM
activesupport (>= 5.2.8.1)
notifications-ruby-client (~> 6.0)
rack (>= 2.1.4.1)
marcel (1.0.2)
marcel (1.0.4)
matrix (0.4.2)
method_source (1.0.0)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.22.3)
msgpack (1.7.2)
Expand All @@ -330,7 +330,7 @@ GEM
timeout
net-smtp (0.5.0)
net-protocol
nio4r (2.7.0)
nio4r (2.7.1)
nokogiri (1.16.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.4-x86_64-darwin)
Expand Down Expand Up @@ -362,7 +362,7 @@ GEM
omniauth (~> 2.0)
orm_adapter (0.5.0)
os (1.1.4)
pagy (6.5.0)
pagy (7.0.11)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
Expand Down Expand Up @@ -392,7 +392,8 @@ GEM
rack (2.2.9)
rack-attack (6.7.0)
rack (>= 1.0, < 4)
rack-protection (3.1.0)
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
rack-session (1.0.2)
rack (< 3)
Expand Down Expand Up @@ -436,14 +437,14 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rbs (3.4.1)
rbs (3.4.4)
abbrev
rdoc (6.6.3.1)
psych (>= 4.0.0)
redcarpet (3.6.0)
redis (4.8.1)
regexp_parser (2.9.0)
reline (0.5.1)
reline (0.5.3)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
Expand Down Expand Up @@ -516,7 +517,7 @@ GEM
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
rubocop-rspec_rails (~> 2.28)
rubocop-rspec_rails (2.28.2)
rubocop-rspec_rails (2.28.3)
rubocop (~> 1.40)
ruby-progressbar (1.13.0)
ruby-rc4 (0.1.5)
Expand All @@ -525,7 +526,6 @@ GEM
ruby2_keywords (0.0.5)
semantic_logger (4.15.0)
concurrent-ruby (~> 1.0)
railties (>= 5.0)
sentry-rails (5.17.3)
railties (>= 5.0)
sentry-ruby (~> 5.17.3)
Expand Down Expand Up @@ -553,7 +553,7 @@ GEM
addressable (~> 2.8, >= 2.8.1)
capybara (~> 3.31)
site_prism-all_there (> 2, < 5)
site_prism-all_there (3.0.3)
site_prism-all_there (3.0.4)
sitemap_generator (6.3.0)
builder (~> 3.0)
snaky_hash (2.0.1)
Expand Down Expand Up @@ -587,8 +587,8 @@ GEM
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
version_gem (1.1.3)
view_component (3.6.0)
version_gem (1.1.4)
view_component (3.11.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
Expand Down
70 changes: 0 additions & 70 deletions app/assets/stylesheets/_task_list.scss

This file was deleted.

3 changes: 1 addition & 2 deletions app/assets/stylesheets/application.sass.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $govuk-new-link-styles: true;
$govuk-assets-path: "/";
$moj-images-path: "/";

@import "govuk-frontend/govuk/all";
@import "govuk-frontend/dist/govuk/all";
@import "@ministryofjustice/frontend/moj/components/ticket-panel/ticket-panel";
@import "@ministryofjustice/frontend/moj/components/timeline/timeline";
@import "dfe-autocomplete/src/dfe-autocomplete";
Expand All @@ -15,7 +15,6 @@ $moj-images-path: "/";
@import "_environments";
@import "_search_results";
@import "_support";
@import "_task_list";

ul.autocomplete__menu {
li {
Expand Down
33 changes: 0 additions & 33 deletions app/components/task_list/component.html.erb

This file was deleted.

42 changes: 0 additions & 42 deletions app/components/task_list/component.rb

This file was deleted.

2 changes: 2 additions & 0 deletions app/forms/teacher_interface/english_language_provider_form.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

require "ostruct"

module TeacherInterface
class EnglishLanguageProviderForm < BaseForm
attr_accessor :application_form
Expand Down
7 changes: 1 addition & 6 deletions app/helpers/upload_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@ def upload_link_to(upload)
)
end
elsif upload.safe_to_link?
govuk_link_to(
"#{upload.filename} (opens in a new tab)",
upload_path(upload),
target: :_blank,
rel: :noopener,
)
govuk_link_to(upload.filename, upload_path(upload), new_tab: true)
else
upload.filename
end
Expand Down
Loading

0 comments on commit 74b292c

Please sign in to comment.