From 6f8a00582471d57e621cbb0e1041f7e1d2c6f3d6 Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Thu, 21 Oct 2021 12:30:06 -0700
Subject: [PATCH 1/3] Fix large density not increasing in fontSize on Amsterdam
 theme

---
 src/components/datagrid/_data_grid_data_row.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/datagrid/_data_grid_data_row.scss b/src/components/datagrid/_data_grid_data_row.scss
index 0d5cc1d367f..15c50d12ec3 100644
--- a/src/components/datagrid/_data_grid_data_row.scss
+++ b/src/components/datagrid/_data_grid_data_row.scss
@@ -241,7 +241,7 @@
 
 @include euiDataGridStyles(fontSizeLarge) {
   @include euiDataGridRowCell {
-    @include euiFontSize;
+    @include euiFontSizeM;
   }
 }
 

From 2590297dcc3963f033cb935d5aff351492e56665 Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Mon, 25 Oct 2021 13:47:51 -0700
Subject: [PATCH 2/3] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bba2b257347..366e515fa96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 - Fixed default text alignment in `EuiTableRowCell` on Safari ([#5283](https://github.com/elastic/eui/pull/5283))
 - Fixed `mobileOptions.truncateText` from getting overridden by `truncateText` in `EuiTableRowCell` ([#5283](https://github.com/elastic/eui/pull/5283))
+- Fixed `EuiDataGrid`'s expanded density not increasing font sizes on Amsterdam ([#5320](https://github.com/elastic/eui/pull/5320))
 
 **Theme: Amsterdam**
 

From 097601d68ffe6687e531be3f1bc95ee9de1b913b Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Tue, 26 Oct 2021 14:18:51 -0700
Subject: [PATCH 3/3] Switch to Amsterdam override

---
 src/components/datagrid/_data_grid_data_row.scss   | 2 +-
 src/themes/eui-amsterdam/overrides/_data_grid.scss | 5 +++++
 src/themes/eui-amsterdam/overrides/_index.scss     | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/themes/eui-amsterdam/overrides/_data_grid.scss

diff --git a/src/components/datagrid/_data_grid_data_row.scss b/src/components/datagrid/_data_grid_data_row.scss
index 15c50d12ec3..0d5cc1d367f 100644
--- a/src/components/datagrid/_data_grid_data_row.scss
+++ b/src/components/datagrid/_data_grid_data_row.scss
@@ -241,7 +241,7 @@
 
 @include euiDataGridStyles(fontSizeLarge) {
   @include euiDataGridRowCell {
-    @include euiFontSizeM;
+    @include euiFontSize;
   }
 }
 
diff --git a/src/themes/eui-amsterdam/overrides/_data_grid.scss b/src/themes/eui-amsterdam/overrides/_data_grid.scss
new file mode 100644
index 00000000000..f885899ef9c
--- /dev/null
+++ b/src/themes/eui-amsterdam/overrides/_data_grid.scss
@@ -0,0 +1,5 @@
+@include euiDataGridStyles(fontSizeLarge) {
+  @include euiDataGridRowCell {
+    @include euiFontSizeM;
+  }
+}
diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss
index ef9f0660d74..096aac0359e 100644
--- a/src/themes/eui-amsterdam/overrides/_index.scss
+++ b/src/themes/eui-amsterdam/overrides/_index.scss
@@ -9,6 +9,7 @@
 @import 'color_stops';
 @import 'combo_box';
 @import 'comment';
+@import 'data_grid';
 @import 'date_picker';
 @import 'date_popover_button';
 @import 'facet';