Merge branch 'main' into 2589-may-19-zap-scan-fixes

Resolved conflicts by:
- Taking all backstop images from main branch
- Taking .ds.baseline from main (with updated line numbers)
- Keeping template literal security fixes in listEntry.js while incorporating main's styling changes
- Taking main's config.py updates (LOGO_CDN_DOMAIN and formatting)

app/assets/javascripts/activityChart.js

@@ -316,9 +316,18 @@
                 return rowSender === currentUserName;
             });
 
-            userRows.slice(0, 5).forEach(row => {
-                row.style.display = '';
-            });
+            if (userRows.length > 0) {
+                userRows.slice(0, 5).forEach(row => {
+                    row.style.display = '';
+                });
+            } else {
+                const emptyMessageRow = Array.from(allRows).find(row => {
+                    return row.querySelector('.table-empty-message');
+                });
+                if (emptyMessageRow) {
+                    emptyMessageRow.style.display = '';
+                }
+            }
         } else {
 
             tableHeading.textContent = 'Service activity';

app/assets/javascripts/listEntry.js

@@ -17,6 +17,7 @@
     this.minEntries = 2;
     this.listItemName = this.$wrapper.data('listItemName');
     this.getSharedAttributes();
+    this.getOriginalClasses();
 
     this.getValues();
     this.maxEntries = this.entries.length;
@@ -28,17 +29,18 @@
   ListEntry.prototype.renderEntry = function(data) {
     return `
       <div class="list-entry">
-        <label for="${data.id}" class="govuk-input--numbered__label">
+        <label for="${data.id}" class="usa-label">
           <span class="usa-sr-only">${data.listItemName} number </span>${data.number}.
         </label>
         <input
+          class="usa-input ${data.classes || ''}"
           name="${data.name}"
           id="${data.id}"
           ${data.value ? `value="${data.value}"` : ''}
           ${data.sharedAttributes}
         />
         ${data.button ? `
-          <button type="button" class="usa-button input-list__button--remove">
+          <button type="button" class="usa-button usa-button--unstyled input-list__button--remove">
             Remove<span class="usa-sr-only"> ${data.listItemName} number ${data.number}</span>
           </button>
         ` : ''}
@@ -46,11 +48,11 @@
     `;
   };
   ListEntry.prototype.renderAddButton = function(data) {
-    return `<button type="button" class="usa-button input-list__button--add">Add another ${data.listItemName} (${data.entriesLeft} remaining)</button>`;
+    return `<button type="button" class="usa-button usa-button--outline input-list__button--add">Add another ${data.listItemName} (${data.entriesLeft} remaining)</button>`;
   };
   ListEntry.prototype.getSharedAttributes = function () {
     var $inputs = this.$wrapper.find('input'),
-        generatedAttributes = ['id', 'name', 'value'],
+        generatedAttributes = ['id', 'name', 'value', 'class'],
         attributes = [],
         attrIdx,
         elmAttributes,
@@ -95,6 +97,20 @@
 
     this.sharedAttributes = (attributes.length) ? getAttributesHTML(attributes) : '';
   };
+  ListEntry.prototype.getOriginalClasses = function () {
+    var $firstInput = this.$wrapper.find('input').first();
+    if ($firstInput.length) {
+      var classList = $firstInput.attr('class');
+      if (classList) {
+        // Preserve any additional classes from the original input
+        this.additionalClasses = classList;
+      } else {
+        this.additionalClasses = '';
+      }
+    } else {
+      this.additionalClasses = '';
+    }
+  };
   ListEntry.prototype.getValues = function () {
     this.entries = [];
     this.$wrapper.find('input').each(function (idx, elm) {
@@ -183,7 +199,8 @@
             'name' : this.getId(entryNumber),
             'value' : entry,
             'listItemName' : this.listItemName,
-            'sharedAttributes': this.sharedAttributes
+            'sharedAttributes': this.sharedAttributes,
+            'classes': this.additionalClasses
           };
 
       if (entryNumber > 1) {

app/assets/javascripts/main.js

@@ -7,9 +7,6 @@ $(() => GOVUK.modules.start());
 
 $(() => $('.error-message, .usa-error-message').eq(0).parent('label').next('input').trigger('focus'));
 
-$(() => $('.govuk-header__container').on('click', function() {
-  $(this).css('border-color', '#005ea5');
-}));
 
 // Applies our expanded focus style to the siblings of links when that link is wrapped in a heading.
 //