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

Merge branch 'master' into gh-pages

Browse source
This commit is contained in:
Garen Torikian 2012-09-28 07:21:02 -07:00
commit badc8bc58c
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
doc/site/images/zorba-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

11
index.html
View file

@ -161,7 +161,7 @@ console.log(addResult);</div>
return x;
}&lt;/div>
&lt;script src="http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8">&lt;/script>
&lt;script src="//d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8">&lt;/script>
&lt;script>
var editor = ace.edit("editor");
editor.setTheme("ace/theme/monokai");
@ -485,6 +485,12 @@ tests for the highlighting.</p>
style="position: relative; left: 12px; top: -4px" />
<a href="http://finecut.info/">Fine Cut Engine</a>
</li>
<li>
<img src="doc/site/images/zorba-logo.png"
style="position: relative; left: -5px; top: 16px; background: #fff;
padding: 6px 4px 6px 6px;" />
<a href="http://www.zorba-xquery.com/html/demo">Zorba XQuery</a>
</li>
<li>
<a href="https://github.com/Gozala/sky-edit">Sky Edit</a>
</li>
@ -497,9 +503,6 @@ tests for the highlighting.</p>
<li>
<a href="http://demo.qooxdoo.org/devel/playground/#">Qooxdoo playground</a>
</li>
<li>
<a href="http://www.zorba-xquery.com/html/demo">Zorba XQuery</a>
</li>
<li>
<a href="http://ext.radiantcms.org/extensions/264-ace">Radiant CMS</a>
</li>