From 05a45be4232a832476b0ff48250d39cc06336c27 Mon Sep 17 00:00:00 2001
From: Johannes Reuter <johannes.reuter@elastic.co>
Date: Mon, 11 Feb 2019 15:28:33 +0100
Subject: [PATCH 1/6] fix ie logo bug

---
 .../management/sections/settings/advanced_settings.scss      | 5 +++++
 .../management/sections/settings/components/field/field.js   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
index b81c17dd8f3a3..b91d3922f1c8d 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
@@ -10,4 +10,9 @@
   &Actions {
     padding-top: $euiSizeM;
   }
+
+  &ImagePreview > img {
+    height: 100px;
+    width: auto;
+  }
 }
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
index 2d87ca4f69163..88caefa09f3e6 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
@@ -409,6 +409,7 @@ class FieldUI extends PureComponent {
               allowFullScreen
               url={value}
               alt={name}
+              className="mgtAdvancedSettings__fieldImagePreview"
             />
           );
         } else {

From 1aa1f898fed3467ba90f9ce5f3bdbc14a08ff395 Mon Sep 17 00:00:00 2001
From: Johannes Reuter <johannes.reuter@elastic.co>
Date: Mon, 11 Feb 2019 16:33:05 +0100
Subject: [PATCH 2/6] fix ie logo bug fix

---
 .../public/management/sections/settings/advanced_settings.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
index b91d3922f1c8d..babab30a86dad 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
@@ -12,7 +12,8 @@
   }
 
   &ImagePreview > img {
-    height: 100px;
+    max-height: 100px;
     width: auto;
+    max-width: 100%;
   }
 }

From ac9d887cdc2f0b1932b525d53f57effd0271cd17 Mon Sep 17 00:00:00 2001
From: Johannes Reuter <johannes.reuter@elastic.co>
Date: Mon, 11 Feb 2019 18:18:12 +0100
Subject: [PATCH 3/6] fix snapshot tests

---
 .../settings/components/field/__snapshots__/field.test.js.snap  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
index f92a9d9209396..ccf14fcae1c7c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
@@ -864,6 +864,7 @@ exports[`Field for image setting should render as read only with help text if ov
           allowFullScreen={true}
           alt="image:test:setting"
           aria-label="image test setting"
+          className="mgtAdvancedSettings__fieldImagePreview"
           fullScreenIconColor="light"
           size="original"
           url="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="
@@ -1144,6 +1145,7 @@ exports[`Field for image setting should render user value if there is user value
           allowFullScreen={true}
           alt="image:test:setting"
           aria-label="image test setting"
+          className="mgtAdvancedSettings__fieldImagePreview"
           fullScreenIconColor="light"
           size="original"
           url="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="

From c989da182ecf1ef42550f54b848d47063519e609 Mon Sep 17 00:00:00 2001
From: Johannes Reuter <johannes.reuter@elastic.co>
Date: Tue, 12 Feb 2019 10:35:03 +0100
Subject: [PATCH 4/6] address PR review

---
 .../sections/settings/advanced_settings.scss         | 12 +++++++++++-
 .../sections/settings/components/field/field.js      |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
index babab30a86dad..36a0013607ed6 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
@@ -5,6 +5,10 @@
 
   &Wrapper {
     width: 640px;
+
+    @include internetExplorerOnly() {
+      min-height: 1px;
+    }
   }
 
   &Actions {
@@ -12,8 +16,14 @@
   }
 
   &ImagePreview > img {
-    max-height: 100px;
+    max-height: 400px;
     width: auto;
     max-width: 100%;
   }
+
+  @include internetExplorerOnly {
+    &Row {
+      min-height: 1px;
+    }
+  }
 }
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
index 88caefa09f3e6..3705e0a160cb4 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
@@ -722,6 +722,7 @@ class FieldUI extends PureComponent {
               label={this.renderLabel(setting)}
               helpText={this.renderHelpText(setting)}
               describedByIds={[`${setting.name}-aria`]}
+              className="mgtAdvancedSettings__fieldRow"
             >
               {this.renderField(setting)}
             </EuiFormRow>

From a2cd5efd4803e4cf4c475a5961935e0e943aff12 Mon Sep 17 00:00:00 2001
From: Johannes Reuter <johannes.reuter@elastic.co>
Date: Tue, 12 Feb 2019 10:54:05 +0100
Subject: [PATCH 5/6] fix snapshots

---
 .../field/__snapshots__/field.test.js.snap    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
index ccf14fcae1c7c..4bdd9ac03461b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
@@ -63,6 +63,7 @@ exports[`Field for array setting should render as read only with help text if ov
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "array:test:setting-aria",
@@ -158,6 +159,7 @@ exports[`Field for array setting should render custom setting icon if it is cust
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "array:test:setting-aria",
@@ -231,6 +233,7 @@ exports[`Field for array setting should render default value if there is no user
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "array:test:setting-aria",
@@ -327,6 +330,7 @@ exports[`Field for array setting should render user value if there is user value
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "array:test:setting-aria",
@@ -442,6 +446,7 @@ exports[`Field for boolean setting should render as read only with help text if
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "boolean:test:setting-aria",
@@ -541,6 +546,7 @@ exports[`Field for boolean setting should render custom setting icon if it is cu
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "boolean:test:setting-aria",
@@ -618,6 +624,7 @@ exports[`Field for boolean setting should render default value if there is no us
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "boolean:test:setting-aria",
@@ -718,6 +725,7 @@ exports[`Field for boolean setting should render user value if there is user val
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "boolean:test:setting-aria",
@@ -837,6 +845,7 @@ exports[`Field for image setting should render as read only with help text if ov
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "image:test:setting-aria",
@@ -930,6 +939,7 @@ exports[`Field for image setting should render custom setting icon if it is cust
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "image:test:setting-aria",
@@ -1001,6 +1011,7 @@ exports[`Field for image setting should render default value if there is no user
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "image:test:setting-aria",
@@ -1095,6 +1106,7 @@ exports[`Field for image setting should render user value if there is user value
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "image:test:setting-aria",
@@ -1227,6 +1239,7 @@ exports[`Field for json setting should render as read only with help text if ove
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "json:test:setting-aria",
@@ -1338,6 +1351,7 @@ exports[`Field for json setting should render custom setting icon if it is custo
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "json:test:setting-aria",
@@ -1454,6 +1468,7 @@ exports[`Field for json setting should render default value if there is no user
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "json:test:setting-aria",
@@ -1589,6 +1604,7 @@ exports[`Field for json setting should render user value if there is user value
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "json:test:setting-aria",
@@ -1720,6 +1736,7 @@ exports[`Field for markdown setting should render as read only with help text if
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "markdown:test:setting-aria",
@@ -1831,6 +1848,7 @@ exports[`Field for markdown setting should render custom setting icon if it is c
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "markdown:test:setting-aria",
@@ -1920,6 +1938,7 @@ exports[`Field for markdown setting should render default value if there is no u
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "markdown:test:setting-aria",
@@ -2032,6 +2051,7 @@ exports[`Field for markdown setting should render user value if there is user va
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "markdown:test:setting-aria",
@@ -2163,6 +2183,7 @@ exports[`Field for number setting should render as read only with help text if o
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "number:test:setting-aria",
@@ -2258,6 +2279,7 @@ exports[`Field for number setting should render custom setting icon if it is cus
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "number:test:setting-aria",
@@ -2331,6 +2353,7 @@ exports[`Field for number setting should render default value if there is no use
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "number:test:setting-aria",
@@ -2427,6 +2450,7 @@ exports[`Field for number setting should render user value if there is user valu
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "number:test:setting-aria",
@@ -2542,6 +2566,7 @@ exports[`Field for select setting should render as read only with help text if o
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "select:test:setting-aria",
@@ -2654,6 +2679,7 @@ exports[`Field for select setting should render custom setting icon if it is cus
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "select:test:setting-aria",
@@ -2744,6 +2770,7 @@ exports[`Field for select setting should render default value if there is no use
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "select:test:setting-aria",
@@ -2857,6 +2884,7 @@ exports[`Field for select setting should render user value if there is user valu
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "select:test:setting-aria",
@@ -2989,6 +3017,7 @@ exports[`Field for string setting should render as read only with help text if o
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "string:test:setting-aria",
@@ -3084,6 +3113,7 @@ exports[`Field for string setting should render custom setting icon if it is cus
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "string:test:setting-aria",
@@ -3157,6 +3187,7 @@ exports[`Field for string setting should render default value if there is no use
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "string:test:setting-aria",
@@ -3253,6 +3284,7 @@ exports[`Field for string setting should render user value if there is user valu
       titleSize="xs"
     >
       <EuiFormRow
+        className="mgtAdvancedSettings__fieldRow"
         describedByIds={
           Array [
             "string:test:setting-aria",

From ca9feb060cf46fe2753caef75fc986d7369af4c1 Mon Sep 17 00:00:00 2001
From: Johannes Reuter <johannes.reuter@elastic.co>
Date: Wed, 13 Feb 2019 08:12:47 +0100
Subject: [PATCH 6/6] remove max height of preview image

---
 .../management/sections/settings/advanced_settings.scss     | 6 ------
 .../components/field/__snapshots__/field.test.js.snap       | 2 --
 .../management/sections/settings/components/field/field.js  | 1 -
 3 files changed, 9 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
index 36a0013607ed6..6710583cf5c87 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss
@@ -15,12 +15,6 @@
     padding-top: $euiSizeM;
   }
 
-  &ImagePreview > img {
-    max-height: 400px;
-    width: auto;
-    max-width: 100%;
-  }
-
   @include internetExplorerOnly {
     &Row {
       min-height: 1px;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
index 4bdd9ac03461b..9c4455f26ac51 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
@@ -873,7 +873,6 @@ exports[`Field for image setting should render as read only with help text if ov
           allowFullScreen={true}
           alt="image:test:setting"
           aria-label="image test setting"
-          className="mgtAdvancedSettings__fieldImagePreview"
           fullScreenIconColor="light"
           size="original"
           url="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="
@@ -1157,7 +1156,6 @@ exports[`Field for image setting should render user value if there is user value
           allowFullScreen={true}
           alt="image:test:setting"
           aria-label="image test setting"
-          className="mgtAdvancedSettings__fieldImagePreview"
           fullScreenIconColor="light"
           size="original"
           url="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
index 3705e0a160cb4..2139a842f639d 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
@@ -409,7 +409,6 @@ class FieldUI extends PureComponent {
               allowFullScreen
               url={value}
               alt={name}
-              className="mgtAdvancedSettings__fieldImagePreview"
             />
           );
         } else {