Merge pull request #3805 from adobe/jasonsanjose/revert-pull-3767

redmunds · redmunds · commit 6db29a128150 · 2013-05-13T16:02:04.000-07:00
Revert border styling perf change and merge official fix from CodeMirror upstream/master
diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
@@ -106,12 +106,7 @@
     
     .CodeMirror-gutters {
         background-color: @background-color-3;
-        
-        /*
-        Maintain line gutter border-right to avoid repaint performance issues
-        See https://github.com/marijnh/CodeMirror/issues/1514
-        */
-        border-color: @background-color-3;
+        border-right: none;
     }
     .CodeMirror-linenumber {
         color: @accent-comment;
diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2
@@ -1 +1 @@
-Subproject commit 32050bbb0a9aa4d7e4ff995c4ecd06abf5c926b6
+Subproject commit fb6df35b2e9c79d6fe4b834d92b8f7ed0407f385
