Merge pull request #3797 from uktrade/develop

Release PR
uktrade · Jan 21, 2025 · 29d84b0 · 29d84b0
2 parents 1948f0e + 9ea745b
commit 29d84b0
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 16 deletions.
diff --git a/core/static/images/Great-homepage-hero-domestic.png b/core/static/images/Great-homepage-hero-domestic.png
diff --git a/core/static/images/great_homepage_hero_energy_lines.png b/core/static/images/great_homepage_hero_energy_lines.png
diff --git a/export_academy/templates/export_academy/event_list.html b/export_academy/templates/export_academy/event_list.html
@@ -84,7 +84,7 @@ <h2 class="govuk-heading-l govuk-!-padding-left-3 great-text-dark-grey">{{ event
                                 <div class="govuk-!-padding-left-3 govuk-!-margin-bottom-2 govuk-!-padding-right-3">
                                     <{{ event.past_year_seperator|h3_if:'h2' }} class="govuk-heading-s govuk-!-margin-bottom-0 great-text-dark-grey">
                                     <a href="{{ event.get_absolute_url }}"
-                                       class="govuk-link govuk-heading-s great-title-link event{% user_is_booked_on_event request.user event as event_is_booked %}{% if not event_is_booked %}-not{% endif %}-booked">
+                                       class="govuk-link great-underline-no-offset govuk-heading-m great-title-link event{% user_is_booked_on_event request.user event as event_is_booked %}{% if not event_is_booked %}-not{% endif %}-booked">
                                         {{ event.name }}
                                         <span class="great-visually-hidden">– {{ event.start_date|date:"d F" }} at {{ event.start_date|time:"gA" }}</span>
                                     </a>

diff --git a/react-components/dist/components_styles.css b/react-components/dist/components_styles.css
diff --git a/react-components/dist/components_styles.css.map b/react-components/dist/components_styles.css.map
diff --git a/react-components/dist/international_styles.css b/react-components/dist/international_styles.css
diff --git a/react-components/dist/international_styles.css.map b/react-components/dist/international_styles.css.map
diff --git a/react-components/dist/learn_styles.css b/react-components/dist/learn_styles.css
diff --git a/react-components/dist/learn_styles.css.map b/react-components/dist/learn_styles.css.map
diff --git a/react-components/dist/loggedout_styles.css b/react-components/dist/loggedout_styles.css
diff --git a/react-components/dist/loggedout_styles.css.map b/react-components/dist/loggedout_styles.css.map
diff --git a/react-components/dist/magna_styles.css b/react-components/dist/magna_styles.css
diff --git a/react-components/dist/magna_styles.css.map b/react-components/dist/magna_styles.css.map
diff --git a/react-components/dist/microsite_styles.css b/react-components/dist/microsite_styles.css
diff --git a/react-components/dist/microsite_styles.css.map b/react-components/dist/microsite_styles.css.map
diff --git a/styles/great/_components.scss b/styles/great/_components.scss
@@ -1822,7 +1822,7 @@ nav.great-breadcrumbs {
 
   @include govuk-media-query($from: desktop) {
     background-color: $great-dark-blue;
-    background-image: url(/static/images/great_homepage_hero_energy_lines.png);
+    background-image: url(/static/images/great-homepage-hero-domestic.png);
   }
 
   .great-hero__heading {

diff --git a/styles/great/_utils.scss b/styles/great/_utils.scss
@@ -1155,6 +1155,10 @@ great-icon {
   font-size: inherit !important;
 }
 
+.great-underline-no-offset {
+  text-underline-offset: 0px !important;
+}
+
 .float-right {
   float: right;
 }