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

Merge remote-tracking branch 'origin/master' into highlighting/mixed

Browse source 
Conflicts:
	index.html
This commit is contained in:
Lennart Kats 2013-09-24 11:51:58 +02:00
commit 373f24849b
23 changed files with 863 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

51
index.html
View file

@ -770,20 +770,19 @@ if (match) {
<a href="http://www.applicationcraft.com/">Application Craft</a>
</li>
<li>
<img src="doc/site/images/wolf_3d_logo_trans.png"
style="left: 10px; top: -4px; width:80px" />
<a href="http://www.wolfcms.org/repository/133">Wolf CMS</a>
<img src="http://benweet.github.io/stackedit/img/stackedit-128.png"
style="width: 74px; left: 13px; top: 1px;">
<a href="http://benweet.github.io/stackedit/">StackEdit</a>
</li>
<li>
<img src="http://upload.wikimedia.org/wikipedia/commons/6/63/Wikipedia-logo.png" style="left: -5px; top: -35px; width: 110px;">
<a href="https://en.wikipedia.org/wiki/Special:Version" style="font-family: 'Linux Libertine','Hoefler Text',Georgia,'Times New Roman',Times,serif;">W<span style="font-variant: small-caps;">ikipedi</span>A</a>
</li>
<li>
<img src="doc/site/images/codiad.png"
style="left: 10px; top: -4px; width:80px" />
<a href="http://codiad.com/">Codiad</a>
</li>
<li>
<img src="doc/site/images/FineCut_small_logo.png"
style="left: 12px; top: -4px" />
<a href="http://finecut.info/">Fine Cut Engine</a>
</li>
<li>
<img src="doc/site/images/zorba-logo.png"
style="left: -5px; top: 16px;
@ -832,7 +831,7 @@ if (match) {
</li>
<li>
<div class="rotating-logo" style="background:url(doc/site/images/habitat-logo.svg) center no-repeat;
left: 19px; top: 6px;width: 60px;height: 60px;background-size: 60px;position: relative;" ></div>
left: 19px; top: 6px;width: 60px;height: 60px;background-size: 60px;position: relative;"></div>
<a href="http://habitat.inkling.com">Inkling Habitat</a>
</li>
<li>
@ -870,6 +869,11 @@ if (match) {
style="left: 9px; top: -5px; width: 84px">
<a href="https://drivenotepad.appspot.com/support">Drive Notepad</a>
</li>
<li>
<img src="doc/site/images/FineCut_small_logo.png"
style="left: 12px; top: -4px" />
<a href="http://finecut.info/">Fine Cut Engine</a>
</li>
<li>
<img src="http://phpassist.com/images/logo-large.png"
style="left: 3px; top: -10px; width: 95px">
@ -952,10 +956,6 @@ if (match) {
style="left: 12px; width: 79px;top: -18px;">
<a href="http://www.divshot.com/">Divshot</a>
</li>
<li>
<div class="text-logo">Codio</div>
<a href="https://codio.com/">Codio</a>
</li>
<li>
<script>
ace.require("ace/lib/dom").importCssStylsheet("https://fonts.googleapis.com/css?family=Henny+Penny", document);
@ -1065,15 +1065,15 @@ if (match) {
<a href="http://www.ogeditor.com/index.aspx">ogEditor</a>
</li>
<li>
<div class="text-logo" >allong.es</div>
<div class="text-logo">allong.es</div>
<a href="http://allong.es/try/">Try allong.es</a>
</li>
<li>
<div class="text-logo" >NapCat</div>
<div class="text-logo">NapCat</div>
<a href="http://napcatapp.tumblr.com/post/60598006734/version-1-3-is-released">NapCat</a>
</li>
<li>
<div class="text-logo" >CorsLit</div>
<div class="text-logo">CorsLit</div>
<a href="http://www.corslit.com/new/melloWorld">CorsLit</a>
</li>
<li>
@ -1082,9 +1082,26 @@ if (match) {
<a href="http://ojjs.org/index.html">OJjs</a>
</li>
<li>
<div class="text-logo" >Codechat</div>
<div class="text-logo">Codechat</div>
<a href="http://codechat.net/">Codechat</a>
</li>
<li>
<img src="doc/site/images/wolf_3d_logo_trans.png"
style="left: 10px; top: -4px; width:80px" />
<a href="http://www.wolfcms.org/repository/133">Wolf CMS</a>
</li>
<li>
<img src="http://thlorenz.github.io/scriptie-talkie/images/code.png" style="left: 20px; top: 20px; width: 60px;">
<a href="http://thlorenz.github.io/scriptie-talkie/">Scriptie-Talkie</a>
</li>
<li>
<div class="text-logo">md</div>
<a href="http://thlorenz.github.io/browserify-markdown-editor/">browserify-markdown-editor</a>
</li>
<li>
<div class="text-logo"></div>
<a href="http://bakemycss.mypathforpython.appspot.com/">BakeMyCss</a>
</li>
<li>
<a href="https://github.com/Gozala/sky-edit">Sky Edit</a>
</li>