Merge pull request #983 from alphagov/defend-tables-against-govukelem…

…ents Defend tables against GOV.UK Elements code
alphagov · Sep 6, 2018 · b560c86 · b560c86
2 parents 48c9751 + 2b162c9
commit b560c86
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -125,6 +125,9 @@
 
   ([PR #976](https://github.com/alphagov/govuk-frontend/pull/976))
 
+- Defend tables against GOV.UK Elements code
+  ([PR #983](https://github.com/alphagov/govuk-frontend/pull/983))
+
 - Pull Request Title goes here
 
   Description goes here (optional)

diff --git a/src/components/table/_table.scss b/src/components/table/_table.scss
@@ -15,16 +15,19 @@
 
   .govuk-table__header {
     @include govuk-typography-weight-bold;
-
-    padding: govuk-spacing(2) govuk-spacing(4) govuk-spacing(2) 0;
-    border-bottom: 1px solid $govuk-border-colour;
-    text-align: left;
   }
 
+  .govuk-table__header,
   .govuk-table__cell {
     padding: govuk-spacing(2) govuk-spacing(4) govuk-spacing(2) 0;
     border-bottom: 1px solid $govuk-border-colour;
     text-align: left;
+    // GOV.UK Elements sets the font-size and line-height for all headers and cells
+    // in tables.
+    @include govuk-compatibility(govuk_elements) {
+      font-size: inherit;
+      line-height: inherit;
+    }
   }
 
   .govuk-table__cell--numeric {