From 9fbc4582806cd76d0153994471c5c6b3219872c4 Mon Sep 17 00:00:00 2001
From: Caroline Horn <549577+cchaos@users.noreply.github.com>
Date: Thu, 7 Mar 2019 23:30:34 -0500
Subject: [PATCH] [Fix] Remove gutter from advanced settings code blocks
 (#32700) (#32720)

but also add a slight left border to the gutter for other possible instances on white backgrounds
---
 .../components/field/__snapshots__/field.test.js.snap     | 8 ++++++++
 .../sections/settings/components/field/field.js           | 2 +-
 .../public/styles/_legacy/components/_ace_overrides.scss  | 5 +----
 3 files changed, 10 insertions(+), 5 deletions(-)

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 9c4455f26ac51..8ed30447a8ef7 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
@@ -1283,6 +1283,7 @@ exports[`Field for json setting should render as read only with help text if ove
                 "tabSize": 2,
               }
             }
+            showGutter={false}
             theme="textmate"
             value="{\\"hello\\": \\"world\\"}"
             width="100%"
@@ -1384,6 +1385,7 @@ exports[`Field for json setting should render custom setting icon if it is custo
                 "tabSize": 2,
               }
             }
+            showGutter={false}
             theme="textmate"
             value="{\\"foo\\": \\"bar\\"}"
             width="100%"
@@ -1520,6 +1522,7 @@ exports[`Field for json setting should render default value if there is no user
                 "tabSize": 2,
               }
             }
+            showGutter={false}
             theme="textmate"
             value="{\\"foo\\": \\"bar\\"}"
             width="100%"
@@ -1656,6 +1659,7 @@ exports[`Field for json setting should render user value if there is user value
                 "tabSize": 2,
               }
             }
+            showGutter={false}
             theme="textmate"
             value="{\\"hello\\": \\"world\\"}"
             width="100%"
@@ -1780,6 +1784,7 @@ exports[`Field for markdown setting should render as read only with help text if
                 "tabSize": 2,
               }
             }
+            showGutter={false}
             theme="textmate"
             value="**bold**"
             width="100%"
@@ -1881,6 +1886,7 @@ exports[`Field for markdown setting should render custom setting icon if it is c
                 "tabSize": 2,
               }
             }
+            showGutter={false}
             theme="textmate"
             value=""
             width="100%"
@@ -1971,6 +1977,7 @@ exports[`Field for markdown setting should render default value if there is no u
                 "tabSize": 2,
               }
             }
+            showGutter={false}
             theme="textmate"
             value=""
             width="100%"
@@ -2103,6 +2110,7 @@ exports[`Field for markdown setting should render user value if there is user va
                 "tabSize": 2,
               }
             }
+            showGutter={false}
             theme="textmate"
             value="**bold**"
             width="100%"
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 2139a842f639d..d270d3ba91c52 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
@@ -397,7 +397,7 @@ class FieldUI extends PureComponent {
               editorProps={{
                 $blockScrolling: Infinity
               }}
-
+              showGutter={false}
             />
           </div>
         );
diff --git a/src/legacy/ui/public/styles/_legacy/components/_ace_overrides.scss b/src/legacy/ui/public/styles/_legacy/components/_ace_overrides.scss
index 2365f8b78d563..b4e754377d9c2 100644
--- a/src/legacy/ui/public/styles/_legacy/components/_ace_overrides.scss
+++ b/src/legacy/ui/public/styles/_legacy/components/_ace_overrides.scss
@@ -44,10 +44,6 @@
       overflow: visible;
     }
 
-    .ace_scroller {
-      border-left: $euiBorderThin;
-    }
-
     .ace_warning {
       color: $euiColorDanger;
     }
@@ -70,6 +66,7 @@
     .ace_gutter {
       background-color: $euiColorEmptyShade;
       color: $euiColorDarkShade;
+      border-left: 1px solid $aceBackground;
     }
 
     .ace_print-margin {