Skip to content

remove everything that isnt a webp, replace it with webp #4

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

Open
patrickpatrickpatrick wants to merge 3 commits into
base: main
Choose a base branch
from
Open

remove everything that isnt a webp, replace it with webp #4

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
1ac9c3d
remove everything that isnt a webp, replace it with webp
patrickpatrickpatrick Jul 4, 2022
7be7cb9
replace all code refs to images to be webps
patrickpatrickpatrick Jul 5, 2022
2e04712
Optimised images with calibre/image-actions
github-actions[bot] Jul 12, 2022
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
20 changes: 5 additions & 15 deletions .github/workflows/calibreapp-image-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Compress images on demand (workflow_dispatch), and at 11pm every Sunday (schedule).
# Open a Pull Request if any images can be compressed.
name: Compress Images
on:
pull_request:
Expand All @@ -10,27 +8,19 @@ on:
- '**.jpeg'
- '**.png'
- '**.webp'
workflow_dispatch:
schedule:
- cron: '00 23 * * 0'
jobs:
build:
# Only run on Pull Requests within the same repository, and not from forks.
if: github.event.pull_request.head.repo.full_name == github.repository
name: calibreapp/image-actions
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Compress Images
id: calibre
uses: calibreapp/image-actions@main
with:
# The `GITHUB_TOKEN` is automatically generated by GitHub and scoped only to the repository that is currently running the action. By default, the action can’t update Pull Requests initiated from forked repositories.
# See https://docs.github.com/en/actions/reference/authentication-in-a-workflow and https://help.github.com/en/articles/virtual-environments-for-github-actions#token-permissions
githubToken: ${{ secrets.GITHUB_TOKEN }}
compressOnly: true
- name: Create New Pull Request If Needed
if: steps.calibre.outputs.markdown != ''
uses: peter-evans/create-pull-request@v3
with:
title: Compressed Images Nightly
branch-suffix: timestamp
commit-message: Compressed Images
body: ${{ steps.calibre.outputs.markdown }}
Binary file removed app/assets/images/Screenshot 2022-06-20 at 11.27.52.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/assets/images/calendars/bunting.png
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/calendars/bunting.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/calendars/icon-calendar-2x.png
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/calendars/icon-calendar-2x.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/calendars/icon-calendar.png
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/calendars/icon-calendar.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/calendars/tinsel.png
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/calendars/tinsel.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/britain_is_great/320px.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/campaign/britain_is_great/320px.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/britain_is_great/768px.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/campaign/britain_is_great/768px.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/britain_is_great/960px.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/campaign/britain_is_great/960px.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/custom-logos/environment-agency.png
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/campaign/custom-logos/environment-agency.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/dvla-new-licence-rules/320px.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/campaign/dvla-new-licence-rules/320px.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/dvla-new-licence-rules/768px.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/campaign/dvla-new-licence-rules/768px.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/dvla-new-licence-rules/960px.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/campaign/dvla-new-licence-rules/960px.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/dwp-workplace-pensions/320px.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/campaign/dwp-workplace-pensions/320px.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/images/campaign/dwp-workplace-pensions/768px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/dwp-workplace-pensions/768px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/dwp-workplace-pensions/960px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/dwp-workplace-pensions/960px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/fire-kills/320px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/fire-kills/320px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/fire-kills/768px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/fire-kills/768px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/fire-kills/960px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/fire-kills/960px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/know-before-you-go/320px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/know-before-you-go/320px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/know-before-you-go/768px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/know-before-you-go/768px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/know-before-you-go/960px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/know-before-you-go/960px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/royal_mail_shares/320px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/royal_mail_shares/320px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/royal_mail_shares/768px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/royal_mail_shares/768px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/royal_mail_shares/960px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/royal_mail_shares/960px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/sort-my-tax/320px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/sort-my-tax/320px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/sort-my-tax/768px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/sort-my-tax/768px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/sort-my-tax/960px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/sort-my-tax/960px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/uk-welcomes/eugo-logo.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/uk-welcomes/eugo-logo.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/unimoney/320px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/unimoney/320px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/unimoney/768px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/unimoney/768px.webp
View file
Open in desktop
Binary file removed app/assets/images/campaign/unimoney/960px.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/campaign/unimoney/960px.webp
View file
Open in desktop
Binary file removed app/assets/images/getsatisfaction.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/getsatisfaction.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/afghan-image-promo-170.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/afghan-image-promo-170.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/afghan-image-promo-240.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/afghan-image-promo-240.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/afghan-image-promo-320.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/afghan-image-promo-320.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/afghan-image-promo-480.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/afghan-image-promo-480.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/afghan-image-promo.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/afghan-image-promo.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/cost-of-living.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/cost-of-living.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/number10.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/number10.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/travel-abroad-step-by-step.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/travel-abroad-step-by-step.webp
View file
Open in desktop
Binary file removed app/assets/images/homepage/ukraine-promo.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/homepage/ukraine-promo.webp
View file
Open in desktop
Binary file removed app/assets/images/roadmap/image.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/roadmap/image.webp
View file
Open in desktop
Binary file removed app/assets/images/roadmap/updates-blog.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/roadmap/updates-blog.webp
View file
Open in desktop
Binary file removed app/assets/images/roadmap/updates-goals.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/roadmap/updates-goals.webp
View file
Open in desktop
Binary file removed app/assets/images/roadmap/updates-work.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/roadmap/updates-work.webp
View file
Open in desktop
Binary file removed app/assets/images/start-pages/make-a-sorn/performance-icon-2x.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/start-pages/make-a-sorn/performance-icon-2x.webp
View file
Open in desktop
Binary file removed app/assets/images/start-pages/make-a-sorn/performance-icon.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/start-pages/make-a-sorn/performance-icon.webp
View file
Open in desktop
Binary file removed app/assets/images/templogo.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/templogo.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/0home.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/0home.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/10counciltax.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/10counciltax.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/11counciltaxbenefit.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/11counciltaxbenefit.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/12feedback.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/12feedback.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/1govuk.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/1govuk.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/2google.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/2google.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/3vat.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/3vat.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/4workingtaxcredit.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/4workingtaxcredit.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/5clockschange.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/5clockschange.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/6taxcreditrelatedbox.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/6taxcreditrelatedbox.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/7incometaxguide.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/7incometaxguide.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/8childbenefitrates.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/8childbenefitrates.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/9studentfinance.jpg
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/9studentfinance.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/clear-of-clutter.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/clear-of-clutter.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/detail-when-needed.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/detail-when-needed.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/poster_frame.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/poster_frame.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/simple-navigation.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/simple-navigation.webp
View file
Open in desktop
Binary file removed app/assets/images/tour/step-by-step.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/tour/step-by-step.webp
View file
Open in desktop
Binary file removed app/assets/images/travel-advice/feed-icon-black.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/travel-advice/feed-icon-black.webp
View file
Open in desktop
Binary file removed app/assets/images/travel-advice/mail-icon-x2.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/travel-advice/mail-icon-x2.webp
View file
Open in desktop
Binary file removed app/assets/images/travel-advice/mail-icon.png
View file
Open in desktop
Diff not rendered.
Binary file added app/assets/images/travel-advice/mail-icon.webp
View file
Open in desktop
2 changes: 2 additions & 0 deletions app/assets/img.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
for i in $(find . -name "*.jpg"); do rm $i; done;
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/_subscribe.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
@include govuk-font($size: 19, $weight: bold);

display: block;
background: image-url("calendars/icon-calendar.png") no-repeat scroll 0 0;
background: image-url("calendars/icon-calendar.webp") no-repeat scroll 0 0;
min-height: 2.5em;
padding: 0 0 0 3em;

@include govuk-device-pixel-ratio {
background-image: image-url("calendars/icon-calendar-2x.png");
background-image: image-url("calendars/icon-calendar-2x.webp");
background-size: 29px 24px;
}
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/views/_calendars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}

.app-o-epic-bunting__bunt {
background-image: image-url("calendars/bunting.png");
background-image: image-url("calendars/bunting.webp");
background-color: transparent;
background-repeat: repeat-x;
background-position: center top;
Expand All @@ -21,7 +21,7 @@
}

.app-o-epic-bunting__bunt--tinsel {
background-image: image-url("calendars/tinsel.png");
background-image: image-url("calendars/tinsel.webp");
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/presenters/faq_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ def answer_for(division)
end

def logo_url
view_context.image_url("govuk_publishing_components/govuk-logo.png")
view_context.image_url("govuk_publishing_components/govuk-logo.webp")
end
end
2 changes: 1 addition & 1 deletion app/presenters/machine_readable/yaml_faq_page_schema_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def questions_and_answers
end

def logo_url
image_url("govuk_publishing_components/govuk-logo.png")
image_url("govuk_publishing_components/govuk-logo.webp")
end

def image_url(image_file)
Expand Down
2 changes: 1 addition & 1 deletion app/views/roadmap/_image.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="govuk-roadmap-section__image">
<svg aria-hidden="true" viewBox="0 0 800 800" xmlns="http://www.w3.org/2000/svg"><defs><clipPath id="a"><path d="M0 600h900V0H0z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(1.3333 0 0 -1.3333 -186 740)"><path d="M184.5 280.5C184.5 427.13 303.37 546 450 546s265.5-118.87 265.5-265.5S596.63 15 450 15 184.5 133.87 184.5 280.5" fill="#5694ca"/><path d="M226.62 316.1c-45.023 0-81.515-36.495-81.515-81.527 0-13.98 3.519-27.147 9.717-38.642 13.772-25.533 71.798-115.93 71.798-115.93s58.026 90.4 71.793 115.93c6.203 11.495 9.726 24.662 9.726 38.642 0 45.032-36.5 81.527-81.519 81.527" fill="#fff"/><path d="M226.62 316.1c-45.023 0-81.515-36.495-81.515-81.527 0-13.98 3.519-27.147 9.717-38.642 13.772-25.533 71.798-115.93 71.798-115.93s58.026 90.4 71.793 115.93c6.203 11.495 9.726 24.662 9.726 38.642 0 45.032-36.5 81.527-81.519 81.527z" fill="none" stroke="#0b0b0b" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8"/><path d="M653 359H445.28c-37.547 0-68.266-30.72-68.266-68.266v-2.968c0-37.546 30.719-68.266 68.266-68.266h80.332c37.547 0 68.267-30.72 68.267-68.266v-2.968c0-37.546-30.72-68.266-68.267-68.266h-280.15" fill="none" stroke="#0b0b0b" stroke-linecap="round" stroke-miterlimit="10" stroke-width="8"/><path d="M226.63 175.3c-32.789 0-59.373 26.577-59.373 59.368 0 32.797 26.584 59.379 59.373 59.379 32.792 0 59.373-26.582 59.373-59.379 0-32.791-26.581-59.368-59.373-59.368" fill="#0b0b0b"/><path d="M204.9 245.43c1.942-.801 4.146.114 4.936 2.035a3.776 3.776 0 0 1-2.056 4.935c-1.903.784-4.116-.151-4.908-2.073-.792-1.912.123-4.117 2.028-4.897M196.36 240.42a3.768 3.768 0 0 1 4.936 2.035 3.779 3.779 0 0 1-2.06 4.936c-1.9.782-4.114-.152-4.907-2.074-.791-1.912.125-4.117 2.031-4.897M193.85 230.92a3.768 3.768 0 0 1 4.937 2.034 3.78 3.78 0 0 1-2.057 4.938c-1.901.781-4.116-.153-4.909-2.074-.791-1.913.124-4.119 2.029-4.898M214.44 242.42c1.942-.801 4.146.115 4.936 2.034a3.78 3.78 0 0 1-2.056 4.938c-1.904.781-4.116-.152-4.908-2.075-.793-1.912.124-4.117 2.028-4.897M249.01 245.43c-1.942-.801-4.146.114-4.938 2.035a3.78 3.78 0 0 0 2.057 4.935c1.905.784 4.116-.151 4.91-2.073.792-1.912-.123-4.117-2.029-4.897M257.55 240.42c-1.942-.802-4.146.113-4.936 2.035a3.78 3.78 0 0 0 2.055 4.936c1.905.782 4.116-.152 4.911-2.074.791-1.912-.125-4.117-2.03-4.897M260.06 230.92a3.769 3.769 0 0 0-4.937 2.034 3.78 3.78 0 0 0 2.056 4.938c1.904.781 4.117-.153 4.909-2.074.793-1.913-.123-4.119-2.028-4.898M239.47 242.42a3.775 3.775 0 0 0-4.939 2.034 3.783 3.783 0 0 0 2.058 4.938c1.905.781 4.118-.152 4.909-2.075.792-1.912-.122-4.117-2.028-4.897M228.95 252.16l.01.01 4.773-2.506v7.032l-4.766-1.509-.015.015a2.433 2.433 0 0 1-.462.467l-.015.015 1.92 6.035h-6.887l1.917-6.035-.013-.015a2.467 2.467 0 0 1-.463-.467l-.015-.015-4.765 1.509v-7.032l4.772 2.506.01-.01c.143-.187.308-.351.494-.489l-2.741-8.268c-.003-.01-.004-.02-.009-.03l-.004-.009.001-.001a4.448 4.448 0 0 1 3.604-5.704c.03-.007.063-.012.096-.017.183-.022.369-.04.559-.04s.376.018.558.04c.032.005.065.01.094.017a4.449 4.449 0 0 1 3.606 5.704v.001l-.002.009-.01.03-2.741 8.268c.185.138.351.302.494.489M226.95 211.71c9.06 0 17.635-.613 25.276-1.706 2.17 9.118 4.807 14.345 7.535 18.064l-5.133 1.827c.511-2.606.592-3.818.02-5.494-.844.828-1.648 2.349-2.275 4.674l-2.484-8.281c1.513 1.041 2.678 1.715 4.013 1.747-2.367-5.099-5.325-6.414-7.242-6.059-2.337.431-3.414 2.515-3.05 4.286.538 2.508 3.111 3.16 4.313.245 2.298 4.687-1.6 6.149-4.112 4.76 3.855 3.845 4.296 7.264 1.185 11.398-4.335-3.312-4.385-6.594-2.435-11.212-2.531 2.897-6.47 1.343-5.046-3.339 1.825 2.825 4.242 1.05 3.863-1.636-.322-2.339-3.409-4.227-7.258-3.894-5.509.501-5.836 4.304-5.974 7.452 1.352.251 3.794-1.005 5.873-3.927l.767 8.785c-2.262-2.359-4.319-2.806-6.603-2.879.76 2.372 4.255 6.26 4.255 6.26h-10.964s3.493-3.888 4.255-6.26c-2.284.073-4.342.52-6.603 2.879l.764-8.785c2.082 2.922 4.52 4.178 5.875 3.927-.136-3.148-.463-6.951-5.976-7.452-3.845-.333-6.933 1.555-7.255 3.894-.378 2.686 2.037 4.461 3.862 1.636 1.424 4.682-2.516 6.236-5.047 3.339 1.952 4.618 1.899 7.9-2.434 11.212-3.112-4.134-2.672-7.553 1.183-11.398-2.51 1.389-6.408-.073-4.109-4.76 1.2 2.915 3.775 2.263 4.313-.245.361-1.771-.713-3.855-3.053-4.286-1.916-.355-4.872.96-7.24 6.059 1.335-.032 2.502-.706 4.016-1.747l-2.488 8.281c-.627-2.325-1.428-3.846-2.275-4.674-.572 1.676-.489 2.888.02 5.494l-5.131-1.827c2.725-3.719 5.364-8.946 7.533-18.061 7.639 1.09 16.207 1.703 25.266 1.703M672.95 541c-34.706 0-62.836-28.133-62.836-62.846 0-10.776 2.712-20.926 7.49-29.787C628.221 428.685 672.95 359 672.95 359s44.729 69.685 55.342 89.367c4.782 8.861 7.497 19.011 7.497 29.787 0 34.713-28.136 62.846-62.839 62.846" fill="#fff"/><path d="M672.95 541c-34.706 0-62.836-28.133-62.836-62.846 0-10.776 2.712-20.926 7.49-29.787C628.221 428.685 672.95 359 672.95 359s44.729 69.685 55.342 89.367c4.782 8.861 7.497 19.011 7.497 29.787 0 34.713-28.136 62.846-62.839 62.846z" fill="none" stroke="#0b0b0b" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="8"/><path d="M672.95 432.46c-25.275 0-45.769 20.486-45.769 45.764 0 25.282 20.494 45.772 45.769 45.772 25.277 0 45.768-20.49 45.768-45.772 0-25.278-20.491-45.764-45.768-45.764" fill="#0b0b0b"/><path d="M656.2 486.52a2.907 2.907 0 1 1 2.221 5.373c-1.468.605-3.173-.116-3.784-1.598a2.89 2.89 0 0 1 1.563-3.775M649.61 482.66a2.906 2.906 0 1 1 2.218 5.374c-1.465.603-3.172-.117-3.783-1.599a2.892 2.892 0 0 1 1.565-3.775M647.68 475.34a2.904 2.904 0 0 1 3.805 1.568 2.912 2.912 0 0 1-1.585 3.806c-1.466.603-3.173-.117-3.784-1.598-.61-1.475.095-3.175 1.564-3.776M663.56 484.2a2.905 2.905 0 0 1 3.805 1.568 2.914 2.914 0 0 1-1.585 3.806c-1.468.603-3.173-.117-3.784-1.599a2.89 2.89 0 0 1 1.564-3.775M690.2 486.52a2.91 2.91 0 0 0-3.808 1.569 2.914 2.914 0 0 0 1.586 3.804c1.47.605 3.173-.116 3.785-1.598a2.89 2.89 0 0 0-1.563-3.775M696.79 482.66a2.906 2.906 0 0 0-3.806 1.569 2.914 2.914 0 0 0 1.584 3.805c1.47.603 3.174-.117 3.786-1.599a2.892 2.892 0 0 0-1.564-3.775M698.72 475.34a2.906 2.906 0 0 0-3.806 1.568 2.914 2.914 0 0 0 1.586 3.806c1.467.603 3.173-.117 3.783-1.598a2.889 2.889 0 0 0-1.563-3.776M682.85 484.2a2.91 2.91 0 0 0-3.808 1.568 2.917 2.917 0 0 0 1.586 3.806c1.469.603 3.175-.117 3.785-1.599a2.89 2.89 0 0 0-1.563-3.775M674.74 491.71l.008.008 3.68-1.932v5.421l-3.675-1.163-.011.011a1.968 1.968 0 0 1-.357.361l-.011.011 1.48 4.652h-5.309l1.477-4.652-.01-.011a1.962 1.962 0 0 1-.356-.361l-.012-.011-3.673 1.163v-5.421l3.679 1.932.008-.008c.109-.143.237-.27.38-.377l-2.112-6.373c-.002-.008-.004-.016-.008-.023l-.002-.007v-.001a3.428 3.428 0 0 1 2.852-4.409c.141-.018.285-.031.431-.031a3.402 3.402 0 0 1 .503.043 3.43 3.43 0 0 1 2.779 4.397v.001l-.002.007c-.001.007-.005.015-.008.023l-2.112 6.373c.143.107.271.234.381.377M673.19 460.53c6.983 0 13.594-.472 19.484-1.315 1.672 7.029 3.706 11.058 5.809 13.925l-3.957 1.408c.393-2.008.456-2.943.016-4.235-.652.638-1.271 1.811-1.754 3.604l-1.915-6.384c1.166.802 2.064 1.322 3.093 1.347-1.825-3.931-4.104-4.945-5.582-4.671-1.802.332-2.631 1.939-2.352 3.303.415 1.934 2.399 2.437 3.325.189 1.772 3.614-1.233 4.741-3.17 3.67 2.972 2.964 3.312 5.599.914 8.786-3.342-2.553-3.381-5.083-1.877-8.643-1.951 2.234-4.988 1.035-3.889-2.573 1.406 2.177 3.269.809 2.977-1.261-.248-1.804-2.629-3.259-5.595-3.003-4.247.387-4.499 3.317-4.605 5.745 1.043.193 2.925-.775 4.527-3.027l.592 6.772c-1.744-1.819-3.33-2.163-5.091-2.22.586 1.829 3.28 4.826 3.28 4.826h-8.451s2.692-2.997 3.28-4.826c-1.761.057-3.347.401-5.09 2.22l.589-6.772c1.605 2.252 3.484 3.22 4.529 3.027-.106-2.428-.358-5.358-4.607-5.745-2.964-.256-5.344 1.199-5.592 3.003-.292 2.07 1.569 3.438 2.976 1.261 1.098 3.608-1.939 4.807-3.889 2.573 1.504 3.56 1.462 6.09-1.877 8.643-2.4-3.187-2.06-5.822.912-8.786-1.936 1.071-4.94-.056-3.168-3.67.926 2.248 2.91 1.745 3.324-.189.279-1.364-.549-2.971-2.353-3.303-1.476-.274-3.755.74-5.581 4.671 1.03-.025 1.929-.545 3.096-1.347l-1.918 6.384c-.483-1.793-1.1-2.966-1.754-3.604-.44 1.292-.377 2.227.016 4.235l-3.955-1.408c2.1-2.867 4.135-6.896 5.806-13.923 5.889.841 12.495 1.313 19.477 1.313" fill="#fff"/><path d="M541 80c0-9.941-8.059-18-18-18s-18 8.059-18 18 8.059 18 18 18 18-8.059 18-18" fill="#ff0"/><path d="M541 80c0-9.941-8.059-18-18-18s-18 8.059-18 18 8.059 18 18 18 18-8.059 18-18z" fill="none" stroke="#0b0b0b" stroke-miterlimit="10" stroke-width="8"/><path d="M452 220c0-9.941-8.059-18-18-18s-18 8.059-18 18 8.059 18 18 18 18-8.059 18-18" fill="#ff0"/><path d="M452 220c0-9.941-8.059-18-18-18s-18 8.059-18 18 8.059 18 18 18 18-8.059 18-18z" fill="none" stroke="#0b0b0b" stroke-miterlimit="10" stroke-width="8"/><path d="M470 359c0-9.941-8.059-18-18-18s-18 8.059-18 18 8.059 18 18 18 18-8.059 18-18" fill="#ff0"/><path d="M470 359c0-9.941-8.059-18-18-18s-18 8.059-18 18 8.059 18 18 18 18-8.059 18-18z" fill="none" stroke="#0b0b0b" stroke-miterlimit="10" stroke-width="8"/></g>
<%# Deliberate use of image tag as a fallback method https://lynn.ru/examples/svg/en.html %>
<image aria-hidden="true" src="<%= asset_path('roadmap/image.png') %>"></image>
<image aria-hidden="true" src="<%= asset_path('roadmap/image.webp') %>"></image>
</svg>
</div>
6 changes: 3 additions & 3 deletions config/locales/cy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,13 @@ cy:
heading: Diweddariadau rhaglen
items:
- href: https://gds.blog.gov.uk/2021/03/29/whats-next-for-gov-uk-in-2021-to-2022/
image_src: roadmap/updates-goals.jpg
image_src: roadmap/updates-goals.webp
heading_text: Ein 5 amcan
- href: https://gdscareers.gov.uk/
image_src: roadmap/updates-work.jpg
image_src: roadmap/updates-work.webp
heading_text: Gweithiwch yn GDS
- href: https://insidegovuk.blog.gov.uk/
image_src: roadmap/updates-blog.jpg
image_src: roadmap/updates-blog.webp
heading_text: Blog Tu mewn i GOV.UK
save:
sessions:
Expand Down
12 changes: 6 additions & 6 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,15 @@ en:
- text: Find out what financial support is available from the government.
title: Cost of living
href: https://costoflivingsupport.campaign.gov.uk/
image_src: homepage/cost-of-living.jpg
image_src: homepage/cost-of-living.webp
- text: Find out about the UK's response to the Russian government's invasion of Ukraine and how you can help.
title: War in Ukraine
href: https://ukstandswithukraine.campaign.gov.uk/
image_src: homepage/ukraine-promo.jpg
image_src: homepage/ukraine-promo.webp
- text: Check the rules on COVID-19 for travelling abroad.
title: 'Travel abroad'
href: /guidance/travel-abroad-from-england-during-coronavirus-covid-19
image_src: homepage/travel-abroad-step-by-step.png
image_src: homepage/travel-abroad-step-by-step.webp
running_limited_company: Running a limited company
search_button: Search GOV.UK
search_label: Search
Expand Down Expand Up @@ -560,13 +560,13 @@ en:
heading: Updates
items:
- href: https://gds.blog.gov.uk/2021/05/20/government-digital-service-our-strategy-for-2021-2024/
image_src: roadmap/updates-goals.jpg
image_src: roadmap/updates-goals.webp
heading_text: Our vision
- href: https://gdscareers.gov.uk/
image_src: roadmap/updates-work.jpg
image_src: roadmap/updates-work.webp
heading_text: Work at GDS
- href: https://insidegovuk.blog.gov.uk/
image_src: roadmap/updates-blog.jpg
image_src: roadmap/updates-blog.webp
heading_text: Inside GOV.UK blog
save: Save
sessions:
Expand Down
2 changes: 1 addition & 1 deletion docs/update-homepage-promotion-slots.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The content for the promo slots can be found in the [`yml` translation file](../
- `text`: the promo description
- `title`: the promo title
- `href`: the link the promo goes to. This can either be internal (`/my-path`) or external (`https://www.mywebsite.com/my-path`)
- `src`: the promo image location. Image should be in the [`homepage` asset directory](../assets/images/homepage) and can be pulled via `homepage/[my-image].png`
- `src`: the promo image location. Image should be in the [`homepage` asset directory](../assets/images/homepage) and can be pulled via `homepage/[my-image].webp`
- `srcset`: this is an optional attribute to define promo image `srcset` values.

You can define `srcset` values in the yml like so:
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/electoral-result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"name": "Joel Williams",
"absolute_url": "https://whocanivotefor.co.uk/person/8071/joel-williams",
"email": null,
"photo_url": "https://static-candidates.democracyclub.org.uk/media/images/images/8071.png"
"photo_url": "https://static-candidates.democracyclub.org.uk/media/images/images/8071.webp"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion test/support/schema_org_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module SchemaOrgHelpers
"url" => "https://www.gov.uk",
"logo" => {
"@type" => "ImageObject",
"url" => "/assets/frontend/govuk_publishing_components/govuk-logo-73b5a4056ffe9988d02c728b56fe9fe7f90bb822322a5f6183ccbb92a99b019a.png",
"url" => "/assets/frontend/govuk_publishing_components/govuk-logo-73b5a4056ffe9988d02c728b56fe9fe7f90bb822322a5f6183ccbb92a99b019a.webp",
},
},
"mainEntity" => [
Expand Down