From 8ffb918824644bf2d7766586566b4db52a055ce1 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 18 Apr 2017 15:43:22 -0400
Subject: [PATCH] FIX: add more consistent gutter to ace editor

old css hack had issues when line number was higher than 10
---
 app/assets/javascripts/admin/components/ace-editor.js.es6   | 1 +
 .../javascripts/admin/templates/customize-themes-edit.hbs   | 1 -
 app/assets/stylesheets/common/admin/customize.scss          | 6 ------
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index b54f7b389c0..67d084e21ed 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -63,6 +63,7 @@ export default Ember.Component.extend({
           this._skipContentChangeEvent = false;
         });
         editor.$blockScrolling = Infinity;
+        editor.renderer.setScrollMargin(10,10);
 
         this.$().data('editor', editor);
         this._editor = editor;
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index be9ef682f47..88ec4e838bd 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -41,7 +41,6 @@
     </div>
 
     <div>
-      <div class='custom-ace-gutter'></div>
       {{ace-editor content=activeSection editorId=editorId mode=activeSectionMode autofocus="true"}}
     </div>
 
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 6abee92aa4e..a25a850586f 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -99,12 +99,6 @@
       }
     }
 
-    .custom-ace-gutter {
-      width: 41px;
-      background-color: #ebebeb;
-      height: 15px;
-    }
-
     .ace_editor {
       position: absolute;
       left: 0;