Merge pull request #3588 from uktrade/develop

Release PR
uktrade · Oct 30, 2024 · f5e95b9 · f5e95b9
2 parents 990cd7b + 628266c
commit f5e95b9
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 26 deletions.
diff --git a/contact/templates/domestic/contact/export-support/guided-journey/step-3.html b/contact/templates/domestic/contact/export-support/guided-journey/step-3.html
@@ -112,7 +112,7 @@ <h2 class="govuk-heading-s govuk-!-margin-bottom-2 govuk-!-padding-right-9 govuk
         autoselect: false,
         minLength: 3,
         displayMenu: 'overlay',
-        placeholder: 'For example Germany',
+        placeholder: 'For example, Germany',
         inputClasses: 'govuk-input great-text-input great-ds-autocomplete-input',
         menuClasses: 'great-autocomplete-overlay',
         defaultValue: '{{ session_data.market }}',

diff --git a/contact/templates/domestic/contact/export-support/includes/goods-widget.html b/contact/templates/domestic/contact/export-support/includes/goods-widget.html
@@ -15,7 +15,7 @@ <h2 class="great-meta-label great-ds-purple-text"><img src="/static/icons/export
             <h3 class="govuk-heading-s govuk-!-margin-bottom-2">Get an EORI number</h3>
             <p class="govuk-body govuk-!-margin-bottom-4">An Economic Operators Registration and Identification (EORI) number is a unique identifier needed for customs clearance when importing and exporting goods from the UK and EU.</p>
 
-            <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0">
+            <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0 govuk-!-display-inline-block">
                 <span class="govuk-accordion__section-toggle-focus">
                     <span class="govuk-accordion-nav__chevron govuk-accordion-nav__chevron--down"></span>
                     <span class="govuk-accordion__section-toggle-text">
@@ -58,7 +58,7 @@ <h3 class="govuk-heading-s govuk-!-margin-bottom-2">Get an EORI number</h3>
             <h3 class="govuk-heading-s govuk-!-margin-bottom-2">Understand rules of origin</h3>
             <p class="govuk-body govuk-!-margin-bottom-4">Rules of origin (ROO) determine the economic nationality of goods. They're used to judge how much of that product originated from a specific nation, and how much value was added to it during the manufacturing process.</p>
 
-            <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0">
+            <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0 govuk-!-display-inline-block">
                 <span class="govuk-accordion__section-toggle-focus">
                     <span class="govuk-accordion-nav__chevron govuk-accordion-nav__chevron--down"></span>
                     <span class="govuk-accordion__section-toggle-text">

diff --git a/contact/templates/domestic/contact/export-support/includes/market-widget.html b/contact/templates/domestic/contact/export-support/includes/market-widget.html
@@ -11,7 +11,7 @@
 <div class="great-bg-white govuk-!-padding-6 govuk-!-margin-bottom-4 great-ds-box-shadow great-ds-widget-container">
     {% include 'domestic/contact/export-support/includes/change-button.html' with url='/your-export-guide/target-export-market/edit?return_to_step=4' %}
 
-    <h2 class="govuk-heading-s great-ds-market-and-flag"><span>{{ market.heading }}</span> {% if country_code %}<img src="/static/images/flags/{{ country_code | lower }}.svg" alt="{{ market_name }} flag" />{% endif %}</h2>
+    <h2 class="govuk-heading-s great-ds-market-and-flag"><span>{{ market.heading }}</span> {% if country_code %}<img src="/static/images/flags/{{ country_code | lower }}.svg" alt="{{ market_name }} flag" width="40px" />{% endif %}</h2>
 
     <div class="great-ds-market-widget">
         <div class="great-ds-market-widget__col">
@@ -74,7 +74,7 @@ <h2 class="govuk-heading-s great-ds-market-and-flag"><span>{{ market.heading }}<
             <p class="govuk-heading-s govuk-!-margin-bottom-2 great-ds-market-and-flag">
                 <span>Sorry, there's currently no market guide for {{ market_name }}</span>
                 {% if country_code %}
-                    <img src="/static/images/flags/{{ country_code | lower }}.svg" alt="{{ market_name }} flag" />
+                    <img src="/static/images/flags/{{ country_code | lower }}.svg" alt="{{ market_name }} flag" width="40px" />
                 {% endif %}
             </p>
             <div>

diff --git a/contact/templates/domestic/contact/export-support/includes/service-widget.html b/contact/templates/domestic/contact/export-support/includes/service-widget.html
@@ -15,7 +15,7 @@ <h2 class="great-meta-label great-ds-purple-text"><img src="/static/icons/export
             <h3 class="govuk-heading-s govuk-!-margin-bottom-2">VAT on services exports</h3>
             <p class="govuk-body govuk-!-margin-bottom-4">All UK VAT registered businesses must charge VAT on the goods and services they sell unless they are exempt. Depending on place of supply rules, you may be able to charge zero rate on the services you export.</p>
 
-            <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0">
+            <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0 govuk-!-display-inline-block">
                 <span class="govuk-accordion__section-toggle-focus">
                     <span class="govuk-accordion-nav__chevron govuk-accordion-nav__chevron--down"></span>
                     <span class="govuk-accordion__section-toggle-text">
@@ -58,7 +58,7 @@ <h3 class="govuk-heading-s govuk-!-margin-bottom-2">VAT on services exports</h3>
             <h3 class="govuk-heading-s govuk-!-margin-bottom-2">Understand withholding taxes when exporting services</h3>
             <p class="govuk-body govuk-!-margin-bottom-4">Withholding tax is sometimes levied on income from service exports by overseas governments. If a withholding tax policy is in place, your overseas client will retain a percentage of the money owed and pay it directly to the local government.</p>
 
-            <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0">
+            <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0 govuk-!-display-inline-block">
                 <span class="govuk-accordion__section-toggle-focus">
                     <span class="govuk-accordion-nav__chevron govuk-accordion-nav__chevron--down"></span>
                     <span class="govuk-accordion__section-toggle-text">

diff --git a/contact/templates/domestic/contact/export-support/includes/suggested-markets-widget.html b/contact/templates/domestic/contact/export-support/includes/suggested-markets-widget.html
@@ -35,7 +35,7 @@ <h2 class="great-meta-label great-ds-purple-text"><img src="/static/icons/export
         {% endif %}
         <div class="great-ds-market-widget">
             <div class="great-ds-market-widget__col">
-                <h3 class="govuk-heading-s great-ds-market-and-flag"><span>{{ market.heading }}</span> <img src="/static/images/flags/{{ market.heading | get_market_code }}.svg" alt="{{ market.heading }} flag" /></h3>
+                <h3 class="govuk-heading-s great-ds-market-and-flag"><span>{{ market.heading }}</span> <img src="/static/images/flags/{{ market.heading | get_market_code }}.svg" alt="{{ market.heading }} flag" width="40px" /></h3>
 
                 <p class="govuk-body govuk-!-margin-bottom-2">{{ market.heading_teaser }}</p>
 

diff --git a/contact/templates/domestic/contact/export-support/support.html b/contact/templates/domestic/contact/export-support/support.html
@@ -43,7 +43,7 @@ <h2 class="govuk-heading-m govuk-!-margin-bottom-2">Our support topics</h2>
                                     {% if features.FEATURE_GUIDED_JOURNEY_EXTRAS %}
                                         <h2 class="govuk-heading-s govuk-!-margin-bottom-6">Our support topics</h2>
                                     {% endif %}
-                                    <div class="govuk-grid-row great-card-row{% if features.FEATURE_GUIDED_JOURNEY_EXTRAS %} great-ds-category-panels great-ds-category-panels--landing{% endif %}">
+                                    <div class="govuk-grid-row great-card-row{% if features.FEATURE_GUIDED_JOURNEY_EXTRAS %} great-ds-category-panels great-ds-category-panels--landing govuk-!-padding-left-3 govuk-!-padding-right-3{% endif %}">
                                         {% include 'domestic/contact/export-support/includes/topic-card.html' with topics=page.page_body %}
                                     </div>
                                     <hr class="great-ds-hr{% if features.FEATURE_GUIDED_JOURNEY_EXTRAS %} govuk-!-margin-top-7 govuk-!-margin-bottom-7{% endif %}" />

diff --git a/contact/templates/domestic/contact/export-support/task-based-sub-category-page.html b/contact/templates/domestic/contact/export-support/task-based-sub-category-page.html
@@ -74,7 +74,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-4">{{ page.page_title }}</h1>
                                                            data-task-element-name="description level 1">
                                                             {{ task.value.description_level_1 }}
                                                         </p>
-                                                        <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0"
+                                                        <span class="govuk-accordion__section-toggle great-ds-details__status govuk-!-margin-bottom-0 govuk-!-display-inline-block"
                                                               data-task-element-name="show/hide outer container">
                                                             <span class="govuk-accordion__section-toggle-focus"
                                                                   data-task-element-name="show/hide inner container">

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
@@ -606,7 +606,8 @@ figure.great-blockquote {
   }
 }
 
-.great-text-input {
+.great-text-input,
+.great-text-input.govuk-input {
   height: 44px;
   padding-left: 15px;
 

diff --git a/styles/great/_great-design-system-temp.scss b/styles/great/_great-design-system-temp.scss
@@ -175,6 +175,10 @@ $great-design-system-govuk-blue: #1d70b8;
   display: inline-flex;
   text-decoration: none;
 
+  &.govuk-link {
+    text-decoration: none;
+  }
+
   i {
     font-size: 1.5rem;
     margin-right: 10px;
@@ -363,7 +367,7 @@ $great-design-system-govuk-blue: #1d70b8;
 }
 
 .great-ds-market-and-flag {
-  display: inline-flex;
+  display: inline-flex !important;
   gap: 20px;
 
   img {