From 145279e64032453337aed2c5775e362e0aced717 Mon Sep 17 00:00:00 2001
From: Ed Horsford <mail@edwardhorsford.com>
Date: Fri, 6 Sep 2024 16:02:01 +0100
Subject: [PATCH 1/4] Update table styles so nhsuk-table has bottom margin

---
 packages/components/tables/_tables.scss | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/components/tables/_tables.scss b/packages/components/tables/_tables.scss
index e064f7a2b..a904df057 100644
--- a/packages/components/tables/_tables.scss
+++ b/packages/components/tables/_tables.scss
@@ -11,7 +11,7 @@
 .nhsuk-table-container {
   @include nhsuk-responsive-margin(7, "bottom");
 
-  display: block;
+  // display: block;
   -webkit-overflow-scrolling: touch;
   -ms-overflow-style: -ms-autohiding-scrollbar;
   overflow-x: auto;
@@ -22,6 +22,16 @@
   }
 }
 
+.nhsuk-table {
+  @include nhsuk-font($size: 19);
+  
+  width: 100%;
+  @include nhsuk-responsive-margin(7, "bottom");
+
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
 /* Table row hover
 ========================================================================== */
 
@@ -72,8 +82,6 @@
  */
 
 .nhsuk-table-responsive {
-  margin-bottom: 0;
-  width: 100%;
 
   thead {
     @include visually-hidden; /* [1] */
@@ -85,7 +93,7 @@
 
   .nhsuk-table__body {
     .nhsuk-table-responsive__heading {
-      font-weight: $nhsuk-font-bold;
+      @include nhsuk-typography-weight-bold;
       padding-right: nhsuk-spacing(3);
       text-align: left; /* [8] */
 

From 2492baeb457e68cf91fed4eaabd67e8b019999e7 Mon Sep 17 00:00:00 2001
From: Ed Horsford <mail@edwardhorsford.com>
Date: Fri, 6 Sep 2024 16:06:11 +0100
Subject: [PATCH 2/4] Update changelog

---
 CHANGELOG.md                            | 1 +
 packages/components/tables/_tables.scss | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51342ffba..194d04511 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fix Sass deprecation on `mix` function (passing a number without unit) ([PR 995](https://github.com/nhsuk/nhsuk-frontend/pull/995))
 - Add nhsukAttributes macro, copied from GOV.UK ([PR 998](https://github.com/nhsuk/nhsuk-frontend/pull/998))
+- Update table styles so tables always have bottom margin ([PR 1005](https://github.com/nhsuk/nhsuk-frontend/pull/1005))
 
 ## 8.3.0 - 24 July 2024
 
diff --git a/packages/components/tables/_tables.scss b/packages/components/tables/_tables.scss
index a904df057..44343537b 100644
--- a/packages/components/tables/_tables.scss
+++ b/packages/components/tables/_tables.scss
@@ -11,7 +11,7 @@
 .nhsuk-table-container {
   @include nhsuk-responsive-margin(7, "bottom");
 
-  // display: block;
+  display: block;
   -webkit-overflow-scrolling: touch;
   -ms-overflow-style: -ms-autohiding-scrollbar;
   overflow-x: auto;

From c7473adb34945b86787b3fa01f9831a932e9de36 Mon Sep 17 00:00:00 2001
From: Ed Horsford <mail@edwardhorsford.com>
Date: Mon, 23 Sep 2024 14:04:13 +0100
Subject: [PATCH 3/4] Make sure table class applies in all cases

---
 packages/components/tables/template.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/tables/template.njk b/packages/components/tables/template.njk
index f380ce270..11cbef7b3 100644
--- a/packages/components/tables/template.njk
+++ b/packages/components/tables/template.njk
@@ -8,7 +8,7 @@
     <h{{ headingLevel }} class="nhsuk-table__heading-tab">{{ params.heading | safe }}</h{{ headingLevel }}>
   {%- endif %}
   {%- endif %}
-  <table {%- if params.responsive %} role="table"{% endif %} class="nhsuk-table{%- if params.responsive %}-responsive{% endif %}
+  <table {%- if params.responsive %} role="table"{% endif %} class="nhsuk-table {%- if params.responsive %}nhsuk-table-responsive{% endif %}
   {%- if params.tableClasses %} {{ params.tableClasses }}{% endif %}"
   {{- nhsukAttributes(params.attributes) }}>
   {%- if params.caption %}

From 9ef85d5bf06047b3a2490ce720942288bd6fb200 Mon Sep 17 00:00:00 2001
From: Ed Horsford <mail@edwardhorsford.com>
Date: Mon, 23 Sep 2024 14:06:10 +0100
Subject: [PATCH 4/4] Add missing space

---
 packages/components/tables/template.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/tables/template.njk b/packages/components/tables/template.njk
index 11cbef7b3..25a5bebf7 100644
--- a/packages/components/tables/template.njk
+++ b/packages/components/tables/template.njk
@@ -8,7 +8,7 @@
     <h{{ headingLevel }} class="nhsuk-table__heading-tab">{{ params.heading | safe }}</h{{ headingLevel }}>
   {%- endif %}
   {%- endif %}
-  <table {%- if params.responsive %} role="table"{% endif %} class="nhsuk-table {%- if params.responsive %}nhsuk-table-responsive{% endif %}
+  <table {%- if params.responsive %} role="table"{% endif %} class="nhsuk-table {%- if params.responsive %} nhsuk-table-responsive{% endif %}
   {%- if params.tableClasses %} {{ params.tableClasses }}{% endif %}"
   {{- nhsukAttributes(params.attributes) }}>
   {%- if params.caption %}