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

Merge remote-tracking branch 'origin/master' into indent_guides

Browse source 
Conflicts:
	lib/ace/theme/textmate.css
This commit is contained in:
Lennart Kats 2012-08-10 09:51:03 +02:00
commit 768bfbb1f2
19 changed files with 155 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/theme/textmate.css
View file

@ -157,7 +157,7 @@
}
.ace-tm .ace_meta.ace_tag {
color:rgb(0, 50, 198);
color:rgb(0, 22, 142);
}
.ace-tm .ace_string.ace_regex {
@ -166,4 +166,4 @@
.ace-tm .ace_indent-guide {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;
}
}