jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'multiCursor'

Browse source 
Conflicts:
	demo/kitchen-sink/demo.js
	lib/ace/test/all_browser.js
This commit is contained in:
Fabian Jakobs 2012-04-12 16:03:24 +02:00
commit aed7ca654c
26 changed files with 1902 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ace/css/editor.css
View file

@ -162,12 +162,12 @@
.ace_marker-layer .ace_selection {
position: absolute;
z-index: 4;
z-index: 5;
}
.ace_marker-layer .ace_bracket {
position: absolute;
z-index: 5;
z-index: 6;
}
.ace_marker-layer .ace_active_line {
@ -181,7 +181,7 @@
.ace_marker-layer .ace_selected_word {
position: absolute;
z-index: 6;
z-index: 4;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;