diff --git a/api/resources/csses/ace_api.css b/api/resources/csses/ace_api.css index d36473d5..16af81f2 100644 --- a/api/resources/csses/ace_api.css +++ b/api/resources/csses/ace_api.css @@ -94,6 +94,10 @@ blockquote p{ zoom:1; /* hasLayout ie7 trigger */ } +.navbar .nav > li > a { + padding: 10px 15px 11px; +} + .navbar { text-align:center; } @@ -111,8 +115,8 @@ blockquote p{ margin-left: 0px; } .brand { - background: transparent url(../images/ace_logo_menu.png) no-repeat 13px 5px; - width: 105px; + background: transparent url(../images/ace_logo_menu.png) no-repeat 33px 5px; + width: 80px; outline: none; height: 40px; padding: 0 10px !important; diff --git a/doc/resources/ace/skeleton/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css index d36473d5..16af81f2 100644 --- a/doc/resources/ace/skeleton/csses/ace_api.css +++ b/doc/resources/ace/skeleton/csses/ace_api.css @@ -94,6 +94,10 @@ blockquote p{ zoom:1; /* hasLayout ie7 trigger */ } +.navbar .nav > li > a { + padding: 10px 15px 11px; +} + .navbar { text-align:center; } @@ -111,8 +115,8 @@ blockquote p{ margin-left: 0px; } .brand { - background: transparent url(../images/ace_logo_menu.png) no-repeat 13px 5px; - width: 105px; + background: transparent url(../images/ace_logo_menu.png) no-repeat 33px 5px; + width: 80px; outline: none; height: 40px; padding: 0 10px !important; diff --git a/doc/resources/ace/skeleton/javascripts/bbq.js b/doc/resources/ace/skeleton/javascripts/bbq.js new file mode 100644 index 00000000..bcbf2483 --- /dev/null +++ b/doc/resources/ace/skeleton/javascripts/bbq.js @@ -0,0 +1,18 @@ +/* + * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010 + * http://benalman.com/projects/jquery-bbq-plugin/ + * + * Copyright (c) 2010 "Cowboy" Ben Alman + * Dual licensed under the MIT and GPL licenses. + * http://benalman.com/about/license/ + */ +(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this); \ No newline at end of file diff --git a/doc/resources/ace/skeleton/javascripts/bootstrap-tab.js b/doc/resources/ace/skeleton/javascripts/bootstrap-tab.js new file mode 100644 index 00000000..070deb8f --- /dev/null +++ b/doc/resources/ace/skeleton/javascripts/bootstrap-tab.js @@ -0,0 +1,135 @@ +/* ======================================================== + * bootstrap-tab.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#tabs + * ======================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* TAB CLASS DEFINITION + * ==================== */ + + var Tab = function (element) { + this.element = $(element) + } + + Tab.prototype = { + + constructor: Tab + + , show: function () { + var $this = this.element + , $ul = $this.closest('ul:not(.dropdown-menu)') + , selector = $this.attr('data-target') + , previous + , $target + , e + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ( $this.parent('li').hasClass('active') ) return + + previous = $ul.find('.active a').last()[0] + + e = $.Event('show', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown' + , relatedTarget: previous + }) + }) + } + + , activate: function ( element, container, callback) { + var $active = container.find('> .active') + , transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if ( element.parent('.dropdown-menu') ) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active.one($.support.transition.end, next) : + next() + + $active.removeClass('in') + } + } + + + /* TAB PLUGIN DEFINITION + * ===================== */ + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tab') + if (!data) $this.data('tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + /* TAB DATA-API + * ============ */ + + $(function () { + $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + }) + +}(window.jQuery); \ No newline at end of file diff --git a/doc/site/iphone.css b/doc/site/iphone.css index f1c2ba03..dd90db03 100644 --- a/doc/site/iphone.css +++ b/doc/site/iphone.css @@ -22,4 +22,4 @@ UL.menu-footer LI { PRE{ font-size:22px; -} +} \ No newline at end of file diff --git a/doc/site/js/main.js b/doc/site/js/main.js new file mode 100644 index 00000000..79973c8e --- /dev/null +++ b/doc/site/js/main.js @@ -0,0 +1,38 @@ + $(function() { + var tabs = $("#tabnav"), + tab_a_selector = "a"; + + var firstLoad = true; + tabs.find(tab_a_selector).click(function(e) { + e.preventDefault(); + if ($(this).attr("href") === "/") + return; + if ($(this).attr("href") === "#api") { + $("#top_container").addClass("collapse"); + } + else if ($(this).is(":visible")) { + if (firstLoad) { + firstLoad = false; + setTimeout(function() { + $("#top_container").removeClass("collapse"); + }, 700); + } + else { + $("#top_container").removeClass("collapse"); + } + } + + $(this).tab("show"); + + var state = {}; + state["nav"] = $(this).attr("href").substr(1); + $.bbq.pushState(state); + }); + + $(window).on("hashchange", function(e) { + tabs.each(function() { + var idx = $.bbq.getState("nav") || "embedding"; + $(this).find(tab_a_selector + "[href='#" + idx + "']").triggerHandler('click'); + }); + }).trigger("hashchange"); + }); \ No newline at end of file diff --git a/doc/site/style.css b/doc/site/style.css index 9076d529..dc0054f9 100644 --- a/doc/site/style.css +++ b/doc/site/style.css @@ -5,9 +5,9 @@ body { } -H2, H3, H4 { - font-family:Trebuchet MS; - font-weight:bold; +h1, h2, h3, h4, h5, h6 { + font-family: Helvetica; + font-weight: 100; margin:0; padding:0; } @@ -19,8 +19,6 @@ H2 { } H3 { - font-family:Trebuchet MS; - font-weight:bold; font-size:22px; color:#253741; margin-top:43px; @@ -28,8 +26,6 @@ H3 { } H4 { - font-family:Trebuchet MS; - font-weight:bold; font-size:21px; color:#222222; margin-bottom:4px; @@ -51,7 +47,7 @@ PRE{ padding : 10px; } - #header { +#header { height: 93px; position: relative; background: url(images/background.png) repeat-x 0 0; @@ -99,7 +95,7 @@ PRE{ } #wrapper { - background:url(images/body_background.png) repeat-x 0 0; + background:url(images/body_background.png) repeat-x 0 -15px; min-height:250px; } @@ -107,7 +103,7 @@ PRE{ font-family:Arial; font-size:14px; color:#222222; - width:1000px; + width: 960px; } #wrapper .content .column1 { @@ -122,8 +118,43 @@ PRE{ position:relative; overflow:hidden; float:left; - width:600px; - padding-top:47px; + /*width:600px;*/ +} + +#top_container h1 { + font-size: 68px; + line-height: 60px; + width: 515px; + float: left; + font-weight: 100; + font-family: Helvetica; + padding-top: 20px; + color: #333; +} + +#top_container { + overflow: hidden; + padding: 15px 40px; + height: 280px; + -webkit-transition: height 0.4s ease-out, opacity 0.4s ease-out, padding 0.4s ease-out, margin 0.4s ease-out; + opacity: 1; + margin-top: 25px; +} + +#top_container.collapse { + padding: 0px; + height: 0px; + opacity: 0; + margin: 0; +} + +#page_logo { + padding: 15px 0; + width: 350px; + float: right; + text-align: center; + height: 220px; + padding-top: 45px; } .fork_on_github { @@ -151,7 +182,7 @@ PRE{ } UL.content-list { - padding:15px; + padding: 15px 20px; margin:0; } @@ -183,11 +214,8 @@ A:hover { } P#first{ - background : rgba(255,255,255,0.5); - padding : 20px; font-size : 16px; line-height : 24px; - margin : 0 0 20px 0; } #footer { @@ -223,6 +251,63 @@ UL.menu-footer LI A:hover { text-decoration:underline; } +.nav-pills.nav { + margin: 25px 0 25px 0; + padding: 0; + border-radius: 5px; + border: 1px solid #d7d7d7; + background: #eeeeee; + background: -moz-linear-gradient(top, #eeeeee 0%, #cccccc 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eeeeee), color-stop(100%,#cccccc)); + background: -webkit-linear-gradient(top, #eeeeee 0%,#cccccc 100%); + background: -o-linear-gradient(top, #eeeeee 0%,#cccccc 100%); + background: -ms-linear-gradient(top, #eeeeee 0%,#cccccc 100%); + background: linear-gradient(to bottom, #eeeeee 0%,#cccccc 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#cccccc',GradientType=0 ); + overflow: hidden; +} +.nav-pills > .active > a, .nav-pills > .active > a:hover { + color: white; + background-color: #555; + box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.8); + text-shadow: none; +} +.nav-tabs > li > a, .nav-pills > li > a { + padding-right: 30px; + padding-left: 30px; + border-right: 1px solid #bbb; + border-radius: 0; + margin: 0; + line-height: 24px; + font-size: 14px; + color: #333; + text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3); + box-shadow: 0 0 1px rgba(255, 255, 255, 1); + -moz-box-shadow: 0 0 1px rgba(255, 255, 255, 1); +} +.nav.nav-pills li:first-child > a { + padding-left: 29px; + padding-right: 29px; +} + +.nav.nav-pills li:first-child > a > img { + width: 34px; +} + +.nav.nav-pills li:last-child > a { + border-right: none; +} + +.tab-content > .active, .pill-content > .active { + padding: 35px 30px; +} + +#top_container, .tab-content > .active, .pill-content > .active { + background: rgba(255, 255, 255, 0.7); + border: 1px solid #DDD; + border-radius: 5px; + -moz-border-radius: 5px; +} \ No newline at end of file diff --git a/index.html b/index.html index 82fefa8f..3ae7e8bf 100644 --- a/index.html +++ b/index.html @@ -2,39 +2,125 @@ - ACE - Ajax.org Cloud9 Editor - - + ACE - The High Performance Code Editor for the Web + + + + + - - + Fork me on GitHub - -
- -
-
- -
-
-
-
-
+
+
+

The high performance code editor for the web.

+ +
+
+ +
+
+

About ACE

+

Ace is a embeddable code editor written in JavaScript. + It matches and extends the features, usability and performance of existing + native editors such as TextMate, Vim or Eclipse. It can be easily embedded + in any web page and JavaScript application. ACE is maintained as the + primary editor for Cloud9 IDE + and is the successor of the Mozilla Skywriter (Bespin) project.

+

Features

+
+
    +
  • Syntax highlighting
    • +
  • Auto indentation and outdent
    • +
  • An optional command line
    • +
  • Work with huge documents (1,000,000+ lines are no problem)
    • +
  • Fully customizable key bindings including VI and Emacs modes
    • +
  • Themes (TextMate themes can be imported)
    • +
  • Search and replace with regular expressions
    • +
  • Highlight matching parentheses
    • +
  • Toggle between soft tabs and real tabs
    • +
  • Displays hidden characters
    • +
  • Highlight selected word
    • +
+

History

+
+

Previously known as “Bespin” or lately “Skywriter” it’s now + known as Ace (Ajax.org Cloud9 Editor)! Bespin and Ace started + as two independent projects both aiming to build a no compromise + code editor component for the web. Bespin started as part of + Mozilla Labs and was based on the <canvas> tag, while Ace is + the Editor component of the Cloud9 IDE + and is using the DOM for rendering. After the release of Ace at + JSConf.eu 2010 + in Berlin the Skywriter team decided to merge Ace with a simplified + version of Skywriter's plugin system and some of Skywriter's + extensibility points. All these changes have been merged back to Ace + now, which supersedes Skywriter. Both Cloud9 IDE + and Mozilla are actively developing and + maintaining Ace.

+
+
+

Take Ace for a spin!

+
+

Check out the Ace live demo or get a Cloud9 IDE account to experience Ace while editing one of your own GitHub projects.

+

Getting the code

+
+

Ace is a community project. We actively encourage and support + contributions. The Ace source code is hosted on GitHub. + Ace is a community project released under the BSD license ‐ + very simple andis friendly to all kinds of projects, whether OSS + or not. We actively encourage and support contributions. + Take charge of your editor and add your favorite language highlighting and keybindings! + 

git clone git://github.com/ajaxorg/ace.git

+
+
+

Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.

+
+
+

Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork. Williamsburg banh mi whatever gluten-free, carles pitchfork biodiesel fixie etsy retro mlkshk vice blog. Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.

+
+
+

Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork. Williamsburg banh mi whatever gluten-free, carles pitchfork biodiesel fixie etsy retro mlkshk vice blog. Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.

+
+
+

Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater. Lomo wolf viral, mustache readymade thundercats keffiyeh craft beer marfa ethical. Wolf salvia freegan, sartorial keffiyeh echo park vegan.

+
+
+

Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater. Lomo wolf viral, mustache readymade thundercats keffiyeh craft beer marfa ethical. Wolf salvia freegan, sartorial keffiyeh echo park vegan.

+
+
+