Merge branch 'master' of github.com:ajaxorg/ace

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "support/node-o3-xml"]
-	path = support/node-o3-xml
-	url = git://github.com/ajaxorg/node-o3-xml.git
 [submodule "support/cockpit"]
 	path = support/cockpit
 	url = git://github.com/ajaxorg/cockpit.git

lib/ace/css/editor.css

@@ -46,13 +46,23 @@
   left: 0px;
 }
 
+.ace_editor .ace_print_margin_layer {
+  z-index: 0;
+  position: absolute;
+  overflow: hidden;
+  margin: 0px;
+  left: 0px;
+  height: 100%;
+  width: 100%;
+}
+
 .ace_editor .ace_print_margin {
   position: absolute;
   height: 100%;
 }
 
 .ace_layer {
-  z-index: 0;
+  z-index: 1;
   position: absolute;
   overflow: hidden;  
   white-space: nowrap;
@@ -76,7 +86,7 @@
 }
 
 .ace_cursor {
-  z-index: 3;
+  z-index: 4;
   position: absolute;
 }
 
@@ -89,20 +99,20 @@
 
 .ace_marker-layer .ace_step {
   position: absolute;
-  z-index: 2;
+  z-index: 3;
 }
 
 .ace_marker-layer .ace_selection {
   position: absolute;
-  z-index: 3;
+  z-index: 4;
 }
 
 .ace_marker-layer .ace_bracket {
   position: absolute;
-  z-index: 4;
+  z-index: 5;
 }
 
 .ace_marker-layer .ace_active_line {
   position: absolute;
-  z-index: 1;
-}
+  z-index: 2;
+}

lib/ace/theme/twilight.js

@@ -64,8 +64,9 @@ define(function(require, exports, module) {
 }\
 \
 .ace-twilight .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
+  border-left: 1px solid #3C3C3C;\
+  width: 100%;\
+  background: #242424;\
 }\
 \
 .ace-twilight .ace_scroller {\

lib/ace/virtual_renderer.js

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -264,13 +265,17 @@ var VirtualRenderer = function(container, theme) {
     }
 
     this.$updatePrintMargin = function() {
+        var containerEl
+
         if (!this.$showPrintMargin && !this.$printMarginEl)
             return;
-
         if (!this.$printMarginEl) {
-            this.$printMarginEl = document.createElement("div");
-            this.content.insertBefore(this.$printMarginEl, this.$textLayer.element);
+            containerEl = document.createElement("div");
+            containerEl.className = "ace_print_margin_layer";
+            this.$printMarginEl = document.createElement("div")
             this.$printMarginEl.className = "ace_print_margin";
+            containerEl.appendChild(this.$printMarginEl);
+            this.content.insertBefore(containerEl, this.$textLayer.element);
         }
 
         var style = this.$printMarginEl.style;

support/node-o3-xml

@@ -1 +0,0 @@
-Subproject commit 563a2b1091bd1b9a7d26a9f597aacb4341edb619