diff --git a/doc/package.json b/doc/package.json index 2d6e4acd..89639d2c 100644 --- a/doc/package.json +++ b/doc/package.json @@ -9,7 +9,7 @@ "node": "~0.6.0" }, "dependencies": { - "panino" : "~1.0.5" + "panino" : "~1.0.12" }, "devDependencies": {} } \ No newline at end of file diff --git a/doc/resources/ace/skeleton/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css index 17ee3a01..52290168 100644 --- a/doc/resources/ace/skeleton/csses/ace_api.css +++ b/doc/resources/ace/skeleton/csses/ace_api.css @@ -842,15 +842,14 @@ h3.methodToggle.active { padding-top: 0; width:100%; background: #101010 url(../images/dashed_back.png) repeat 0 0; - color: #c3c3c3; - border-top: none; font-size: 12px; + color: white; + border-top: none; margin-top: 0; } #footer .container { width: 710px; padding-left: 300px; - font-size: 11px; margin-left: auto; margin-right: auto; min-height: 60px; @@ -871,7 +870,7 @@ h3.methodToggle.active { } #footer a, #footer a:hover { - color: white; + color: #8DD0FF; } #footer .c9-logo { width: 141px; @@ -967,6 +966,8 @@ body #dsq-reply h3{ display : none; } +/* Sticky footer stuff */ + html { height: 100%; diff --git a/doc/resources/ace/skeleton/javascripts/ga.js b/doc/resources/ace/skeleton/javascripts/ga.js index f6395b5c..f0035835 100644 --- a/doc/resources/ace/skeleton/javascripts/ga.js +++ b/doc/resources/ace/skeleton/javascripts/ga.js @@ -1,9 +1,9 @@ -var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-31174430-1']); - _gaq.push(['_trackPageview']); - - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-18736001-1']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); \ No newline at end of file diff --git a/doc/resources/ace/templates/lib.jade b/doc/resources/ace/templates/lib.jade index 2e2c2fd7..a9befa1b 100644 --- a/doc/resources/ace/templates/lib.jade +++ b/doc/resources/ace/templates/lib.jade @@ -259,7 +259,7 @@ mixin links(collection) mixin formatGHHref(url, type) url = url.substring(url.indexOf("src/") + 4) - + if type == 'nodejs_ref_guide' url = url.substring(0, url.lastIndexOf("#")) url = 'src/' + url @@ -267,4 +267,4 @@ mixin formatGHHref(url, type) url = 'src/' + url -url = url.replace(/\/{2,}/g, "/").replace(/\//g,"%2F") - [edit] \ No newline at end of file + [edit] \ No newline at end of file diff --git a/doc/resources/common_layout.jade b/doc/resources/common_layout.jade index e7f6646d..c1202203 100644 --- a/doc/resources/common_layout.jade +++ b/doc/resources/common_layout.jade @@ -56,8 +56,9 @@ mixin navBar mixin footer footer#footer .container - .footer-text.pull-right Ace & Cloud9 IDE are © c9.io 2012 - + .footer-text.pull-right + p + About Cloud9 | Ace & Cloud9 IDE are © Ajax.org 2012 mixin endingScripts // scripts concatenated and minified via ant build script diff --git a/index.html b/index.html index 6268c4e1..616a1f00 100644 --- a/index.html +++ b/index.html @@ -113,9 +113,9 @@