Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ruby 3223 wcr upgrade defra ruby template version to v 5 4 0 #15

Merged
merged 3 commits into from
Jun 19, 2024
+10 −16
Merged

Ruby 3223 wcr upgrade defra ruby template version to v 5 4 0 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3387d5
[RUBY-3223] Update favicon and icon links in defra_ruby_template.html…
jjromeo Jun 18, 2024
d49e574
[RUBY-3223] Update asset precompile list with new favicon and GOV.UK …
jjromeo Jun 18, 2024
02b2fa9
[RUBY-3223] Bump version to 5.4.1
jjromeo Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
defra_ruby_template (5.4.0)
defra_ruby_template (5.4.1)

GEM
remote: https://rubygems.org/
Expand Down
11 changes: 5 additions & 6 deletions app/views/layouts/defra_ruby_template.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">

<link rel="shortcut icon" href="<%= asset_path "favicon.ico" %>" type="image/x-icon" />
<link rel="mask-icon" href="<%= asset_path "govuk-logotype-crown.png" %>">
<link rel="apple-touch-icon" sizes="180x180" href="<%= asset_path "govuk-apple-touch-icon-180x180.png" %>">
<link rel="apple-touch-icon" sizes="167x167" href="<%= asset_path "govuk-apple-touch-icon-167x167.png" %>">
<link rel="apple-touch-icon" sizes="152x152" href="<%= asset_path "govuk-apple-touch-icon-152x152.png" %>">
<link rel="apple-touch-icon" href="<%= asset_path "govuk-apple-touch-icon.png" %>">
<link rel="icon" sizes="48x48" href="<%= asset_path "favicon.ico" %>">
<link rel="icon" sizes="any" href="<%= asset_path "favicon.svg" %>" type="image/svg+xml">
<link rel="mask-icon" href="<%= asset_path "govuk-icon-mask.svg" %>" color="#0b0c0c">
<link rel="apple-touch-icon" href="<%= asset_path "govuk-icon-180.png" %>">

<%= yield :head %>
<meta property="og:image" content="<%= asset_path "govuk-opengraph-image.png" %>">
Expand Down Expand Up @@ -47,7 +46,7 @@
</svg>
<!--<![endif]-->
<!--[if IE 8]>
<img src="/assets/images/govuk-logotype-tudor-crown.png" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
<img src="<%= asset_path "govuk-icon-mask.svg" %>" class="govuk-header__logotype-crown-fallback-image" width="32" height="30" alt="">
<![endif]-->
</span>
</a>
Expand Down
11 changes: 3 additions & 8 deletions lib/defra_ruby_template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,9 @@ class Engine < ::Rails::Engine
app.config.assets.precompile <<
[
"favicon.ico",
"govuk-apple-touch-icon-152x152.png",
"govuk-apple-touch-icon-167x167.png",
"govuk-apple-touch-icon-180x180.png",
"govuk-apple-touch-icon.png",
"govuk-crest-2x.png",
"govuk-crest.png",
"govuk-logotype-crown.png",
"govuk-mask-icon.svg",
"favicon.svg",
"govuk-icon-mask.svg",
"govuk-icon-180.png",
"govuk-opengraph-image.png"
]
end
Expand Down
2 changes: 1 addition & 1 deletion lib/defra_ruby_template/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module DefraRubyTemplate
VERSION = "5.4.0"
VERSION = "5.4.1"
end
Loading