diff options
author | Matthew Fitzsimmons <matt@joyent.com> | 2012-01-22 08:02:16 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2012-01-24 01:11:32 +0400 |
commit | 831c8199f66fee18c68fcc56c96767cca5591e61 (patch) | |
tree | bffb35fbd2d19a6148c9e0e2715bc99a63800405 /doc | |
parent | 6c0c00a2052ec613503a0322dcbabb6fcf41dab0 (diff) |
Nodejs.org design refresh.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/about/index.html | 63 | ||||
-rw-r--r-- | doc/api_assets/style.css | 242 | ||||
-rw-r--r-- | doc/community/index.html | 262 | ||||
-rw-r--r-- | doc/ebay-logo.png | bin | 2354 -> 1206 bytes | |||
-rw-r--r-- | doc/index.html | 18 | ||||
-rw-r--r-- | doc/logos/index.html | 36 | ||||
-rw-r--r-- | doc/pipe.css | 246 | ||||
-rw-r--r-- | doc/sh_vim-dark.css | 10 | ||||
-rw-r--r-- | doc/template.html | 61 |
9 files changed, 737 insertions, 201 deletions
diff --git a/doc/about/index.html b/doc/about/index.html index f3a33554f48..549b8d6f033 100644 --- a/doc/about/index.html +++ b/doc/about/index.html @@ -18,27 +18,35 @@ href="http://feeds.feedburner.com/nodejs/123123123"> <title>node.js</title> </head> - <body> - <div id="intro"> + <body class="alt"> + <div id="intro" class="interior"> <a href="/" title="Go back to the home page"> - <img id="logo" src="../logo.png" alt="node.js"> + <img id="logo" src="../logo-light.png" alt="node.js"> </a> </div> <div id="content" class="clearfix"> + <div id="column2" class="interior"> + <ul> + <li><a href="/" class="home">Home</a></li> + <li><a href="/#download" class="download">Download</a></li> + <li><a href="/about/" class="about current">About</a></li> + <li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html" class="docs">Docs</a></li> + <li><a href="http://blog.nodejs.org" class="blog">Blog</a></li> + <li><a href="/community/" class="community">Community</a></li> + <li><a href="/logos/" class="logos">Logos</a></li> + <li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li> + </ul> + <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p> + </div> + <div id="column1" class="interior"> - <h2>About</h2> + <h1>Node's goal is to provide an easy way to build scalable + network programs</h1> - <pre> -var http = require('http'); -http.createServer(function (req, res) { - res.writeHead(200, {'Content-Type': 'text/plain'}); - res.end('Hello World\n'); -}).listen(1337, "127.0.0.1"); -console.log('Server running at http://127.0.0.1:1337/');</pre> - <p>Node's goal is to provide an easy way to build scalable - network programs. In the "hello world" web server example - above, many client connections can be handled concurrently. + <p>In the "hello world" web server example + below, many client connections can be handled concurrently. Node tells the operating system (through <code>epoll</code>, <code>kqueue</code>, <code>/dev/poll</code>, or <code>select</code>) that it should be notified when a new @@ -46,6 +54,13 @@ console.log('Server running at http://127.0.0.1:1337/');</pre> connects, then it executes the callback. Each connection is only a small heap allocation.</p> + <pre> +var http = require('http'); +http.createServer(function (req, res) { + res.writeHead(200, {'Content-Type': 'text/plain'}); + res.end('Hello World\n'); +}).listen(1337, "127.0.0.1"); +console.log('Server running at http://127.0.0.1:1337/');</pre> <p>This is in contrast to today's more common concurrency model where OS threads are employed. Thread-based networking is relatively inefficient and very difficult to use. See: <a @@ -99,16 +114,26 @@ console.log('Server running at http://127.0.0.1:1337/');</pre> <li><a href="http://nodejs.org/jsconf2010.pdf">Slides from JSConf 2010</a></li> <li><a href="http://www.yuiblog.com/blog/2010/05/20/video-dahl/">Video from a talk at Yahoo in May 2010</a></li> </ul> - <p><a href="/">Go back to the home page</a></p> </div> - <div id="column2" class="interior"> - </div> </div> <div id="footer"> - <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js - is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>. + <ul class="clearfix"> + <li><a href="/">Node.js</a></li> + <li><a href="/#download">Download</a></li> + <li><a href="/about/">About</a></li> + <li><a href="http://search.npmjs.org/">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li> + <li><a href="http://blog.nodejs.org">Blog</a></li> + <li><a href="/community/">Community</a></li> + <li><a href="/logos/">Logos</a></li> + <li><a href="http://jobs.nodejs.org/">Jobs</a></li> + <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> + </ul> + + <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.8/LICENSE">license</a>.</p> </div> + <script src="../sh_main.js"></script> <script src="../sh_javascript.min.js"></script> <script>highlight(undefined, undefined, 'pre');</script> diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css index c47f3812b84..b5665d53b72 100644 --- a/doc/api_assets/style.css +++ b/doc/api_assets/style.css @@ -1,18 +1,22 @@ /*--------------------- Layout and Typography ----------------------------*/ +html { + -webkit-font-smoothing: antialiased; +} + body { -// font-family: "Helvetica Neue", Helvetica, FreeSans, Arial, sans-serif; - font-family: Georgia, FreeSerif, Times, serif; - font-size: 0.9375em; - line-height: 1.4667em; - color: #222; - margin: 0; padding: 0; + font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif; + font-size: 14px; + line-height: 180%; + color: black; + margin: 0; padding: 40px 0 0 0; + border-top: 6px #8CC84B solid; } a { - color: #0050c0; + color: #669900; text-decoration: underline; } a:visited { - color: #b950b7; + color: #46483e; text-decoration: underline; } a:hover, a:focus { @@ -28,6 +32,18 @@ a { display: none; } +#gtoc a { + font-family: Georgia, FreeSerif, Times, serif; + font-size: 16px; + text-decoration: none; + color: #46483e; +} + +#gtoc a:hover { + color: #669900; + text-decoration: underline; +} + .notice { display: block; padding: 1em; @@ -89,15 +105,18 @@ dd + dt.pre { } h1, h2, h3, h4, h5, h6 { - font-family: Georgia, FreeSerif, Times, serif; + font-family: Helvetica, Arial, sans-serif color: #000; text-rendering: optimizeLegibility; position: relative; } h1 { - font-size: 2.55em; - line-height: 1.375em; + font-family: Georgia, FreeSerif, Times, serif; + font-size: 30px; + font-weight: normal; + line-height: 36px; + color: #669900; } h2 { @@ -159,12 +178,13 @@ h6 { } pre { - padding: 2em 1.6em 2em 1.2em; + padding: 1em 1.6em 1em 1.2em; vertical-align: top; background: #f8f8f8; border: 1px solid #e8e8e8; border-width: 1px 1px 1px 6px; margin: -0.5em 0 1.1em; + overflow-x:auto; } pre + h3 { @@ -175,28 +195,27 @@ code.pre { white-space: pre; } -#container { - position: relative; - padding: 6em; - max-width: 50em; - text-align: left; +#intro { + width: 775px; + margin: 0 auto; + text-align: center; + color: #d2d8ba; + + /* preload platform-icons.png */ + background-image: url(platform-icons.png); + background-repeat: no-repeat; + background-position: -1000px -1000px; } -#container header { - margin: 1.25em -0.5em 1.3em; - padding: 0 0.5em 0.225em; +#intro.interior #logo { + margin-left: -130px; } hr { background: none; border: medium none; border-bottom: 1px solid #ccc; - margin: 5em 0 2em; -} - -#container header hr { - margin: 0; - padding: 0; + margin: 2em 0 2em; } #toc { @@ -242,3 +261,174 @@ a.octothorpe { h6:hover > a.octothorpe { opacity: 1; } +#content { + width: 800px; + margin: 0 auto; + overflow: visible; + clear: both; + display: block; +} + +#column1.interior { + width: 590px; + float: right; + padding-top: 20px; +} + +#column2.interior { + width: 160px; + float: left; + margin-top: -50px; + overflow: visible; +} + +#column2.interior ul { + margin-left: 0; +} + +#column2.interior li { + list-style-type: none; +} + +#column2.interior li a { + display: block; + padding: 0 0 0 40px; + color: #878b78; + text-transform: uppercase; + text-decoration: none; + font-size: 12px; + line-height: 23px; +} + +#column2.interior li a.home { background: url(icons-interior.png) no-repeat -158px 3px; } +#column2.interior li a.download { background: url(icons-interior.png) no-repeat -158px -21px; } +#column2.interior li a.about { background: url(icons-interior.png) no-repeat -158px -44px; } +#column2.interior li a.npm { background: url(icons-interior.png) no-repeat -158px -70px; } +#column2.interior li a.docs { background: url(icons-interior.png) no-repeat -158px -93px; } +#column2.interior li a.blog { background: url(icons-interior.png) no-repeat -158px -117px; } +#column2.interior li a.community { background: url(icons-interior.png) no-repeat -158px -140px; } +#column2.interior li a.logos { background: url(icons-interior.png) no-repeat -158px -164px; } +#column2.interior li a.jobs { background: url(icons-interior.png) no-repeat -158px -189px; } + +#column2.interior li a.home.current { background-position: left 3px; } +#column2.interior li a.download.current { background-position: left -21px; } +#column2.interior li a.about.current { background-position: left -44px; } +#column2.interior li a.npm.current { background-position: left -70px; } +#column2.interior li a.docs.current { background-position: left -93px; } +#column2.interior li a.blog.current { background-position: left -117px; } +#column2.interior li a.community.current { background-position: left -140px; } +#column2.interior li a.logos.current { background-position: left -164px; } +#column2.interior li a.jobs.current { background-position: left -189px; } +#column2.interior li a.current { color: #8cc84b; font-weight: bold; } + +#column2.interior li a.home:hover { background-position: -333px 3px; } +#column2.interior li a.download:hover { background-position: -333px -21px; } +#column2.interior li a.about:hover { background-position: -333px -44px; } +#column2.interior li a.npm:hover { background-position: -333px -70px; } +#column2.interior li a.docs:hover { background-position: -333px -93px; } +#column2.interior li a.blog:hover { background-position: -333px -117px; } +#column2.interior li a.community:hover { background-position: -333px -140px; } +#column2.interior li a.logos:hover { background-position: -333px -164px; } +#column2.interior li a.jobs:hover { background-position: -333px -189px; } +#column2.interior li a:hover { color: #000000; text-decoration: none; } + +#column2.interior li + li { + border-top: 1px solid #c1c7ac; +} +#column2.interior p.twitter { + padding-top: 20px; +} + +#column2.interior p.twitter a { + background: url(twitter-bird.png) no-repeat 0 4px; + padding-left: 37px; + text-decoration: none; +} + +#column2.interior p.twitter a:hover { + text-decoration: underline; +} + +a.totop { + font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif; + font-weight: bold; + text-indent: -9999999px; + background: url(anchor.png) no-repeat top left; + margin-right: 7px; + display: block; + width: 13px; + border-bottom: 1px solid #cccccc; +} + +a.anchor { + font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif; + font-weight: bold; + text-indent: -9999999px; + background: url(anchor.png) no-repeat top right; + display: block; + width: 13px; + border-bottom: 1px solid #cccccc; +} +#footer { + width: 775px; + border-top: 1px solid #626557; + margin: 50px auto 30px auto; + padding-top: 15px; +} + +#footer p { + color: #8BC84B; + font-size: 10px; + padding-left: 195px; + color: #878b78; +} + +#footer p a { + text-decoration: underline; + color: #878b78; +} + +#footer ul { + background: url(footer-logo-alt.png) left top no-repeat; + padding-left: 195px; + height: 26px; + padding-top: 6px; + margin-left: 0; +} + +#footer ul li { + list-style-type: none; + display: block; + float: left; + font-size: 12px; +} + +#footer ul li a { + margin: 0; + padding: 0; +} + +#footer ul li + li { + height: 12px; + margin-left: 3px; +} + +#footer ul li + li a { + padding: 0 0 0 4px; + border-left: 1px solid #878b78; +} + +#footer ul li a.twitter { + background: url(twitter-bird.png) no-repeat 0 2px; + padding-left: 19px; +} + +/* simpler clearfix */ +.clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} + diff --git a/doc/community/index.html b/doc/community/index.html index 3219f7bf847..13387987f41 100644 --- a/doc/community/index.html +++ b/doc/community/index.html @@ -21,134 +21,166 @@ <title>node.js</title> </head> <body> - <div id="intro"> + <div id="intro" class="interior"> <a href="/" title="Go back to the home page"> <img id="logo" src="../logo.png" alt="node.js"> </a> </div> <div id="content" class="clearfix"> - <div id="column1" class="interior"> - <p>Node's most valuable feature is the friendly and <a - href="http://blip.tv/jsconf/nodeconf-2011-marak-squires-5729610">colorful - community</a> of developers. There are many places where - this group congregates on the internet. This page attempts - to highlight the best forums.</p> - - <h2>Periodicals</h2> - - <p> <a - href="http://planetnodejs.com">Planet Node</a> is an - aggregator of Node developer blogs. <a - href="http://nodeup.com/">NodeUp</a> - is a podcast covering the latest Node news in the - community. </p> - - <h2>Docs</h2> - - <p> - Besides the <a href="http://nodejs.org/docs/latest/api">official API - docs</a> there are a number of sites new users should be - aware of. <A href="http://docs.nodejitsu.com/">docs.nodejitsu.com</A> - answers many of the common problems people come across. - <a href="http://howtonode.org/">How To Node</a> has a - growing number of useful tutorials. - The <a href="http://stackoverflow.com/questions/tagged/node.js">Stack - Overflow node.js tag</a> is collecting new information - every day. + <div id="column2" class="interior"> + <ul> + <li><a href="/" class="home">Home</a></li> + <li><a href="/#download" class="download">Download</a></li> + <li><a href="/about/" class="about">About</a></li> + <li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html" class="docs">Docs</a></li> + <li><a href="http://blog.nodejs.org" class="blog">Blog</a></li> + <li><a href="/community/" class="community current">Community</a></li> + <li><a href="/logos/" class="logos">Logos</a></li> + <li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li> + </ul> + <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p> + + </div> + <div id="column1" class="interior"> + <p>Node's most valuable feature is the friendly and <a href="http://blip.tv/jsconf/nodeconf-2011-marak-squires-5729610">colorful community</a> of developers. There are many places where this group congregates on the internet. This page attempts to highlight the best forums.</p> - <h2>GitHub</h2> - <p>All development takes place at <a - href="http://github.com/joyent/node">http://github.com/joyent/node</a>. - The comments on commit messages are often source of heated - discussion regarding core development. The <a - href="http://github.com/joyent/node/wiki">GitHub Node - wiki</a> is full of useful links for newcomers. Don't - miss <a - href="https://github.com/joyent/node/wiki/Projects,-Applications,-and-Companies-Using-Node">Projects, - Applications, and Companies Using Node</a> or the <a - href="https://github.com/joyent/node/wiki/modules">very - long list of Node modules</a>, many of which are - published in the <a href="http://search.npmjs.org/">npm - registry</a>.</p> + <div class="row clearfix"> + <div class="block"> + <h2 class="documentation">Documentation</h2> + + <p><a href="http://nodejs.org/docs/latest/api">official API docs</a></p> + <p><a href="http://docs.nodejitsu.com/">docs.nodejitsu.com</a> answers many of the common problems people come across.</p> + <p><a href="http://howtonode.org/">How To Node</a> has a growing number of useful tutorials.</p> + <p><a href="http://stackoverflow.com/questions/tagged/node.js">Stack Overflow node.js tag</a> collects new information every day.</p> + </div> + + + <div class="block"> + <h2 class="github">GitHub</h2> + <p>All development takes place at <a + href="http://github.com/joyent/node">http://github.com/joyent/node</a>. + The comments on commit messages are often source of heated + discussion regarding core development.</p><p>The <a + href="http://github.com/joyent/node/wiki">GitHub Node + wiki</a> is full of useful links for newcomers. Don't + miss <a + href="https://github.com/joyent/node/wiki/Projects,-Applications,-and-Companies-Using-Node">Projects, + Applications, and Companies Using Node</a> or the <a + href="https://github.com/joyent/node/wiki/modules">very + long list of Node modules</a>, many of which are + published in the <a href="http://search.npmjs.org/">npm + registry</a>.</p> + </div> + </div> - <p><a href="http://notinventedhe.re/on/2011-7-26"><img - src="not-invented-here.png" width="100%"></a> Bugs - should be reported to <a - href="https://github.com/joyent/node/issues">https://github.com/joyent/node/issues</a>. - Fixes to the code are welcome! Please see our <a - href="https://github.com/joyent/node/wiki/Contributing">contributing - guidelines</a> for information on how to submit a - patch.</p> - - <h2>Mailing Lists</h2> - - <p>The <a - href="http://groups.google.com/group/nodejs">user - mailing list</a> is used for announcements, discussion, - and flame wars about Node. The <a - href="http://groups.google.com/group/nodejs-dev">internal - development mailing list</a> is used for discussion of - internal design and feature proposals.</p> - - <h2>IRC</h2> - - <p>For real-time chat about Node development go to - <code>irc.freenode.net</code> in the <code>#node.js</code> - channel with an <a href="http://www.mirc.com">IRC</a> <a - href="http://colloquy.info/">client</a> or connect in - your web browser to the channel using <a - href="http://webchat.freenode.net/?channels=node.js">freenode's - WebChat</a>. Felix Geisendörfer keeps <a - href="http://nodejs.debuggable.com/">logs of the - channel</a> for those who miss a day.</p> - <h2>Conferences</h2> - - <p><a href="http://www.nodeconf.com/">NodeConf</a> - conferences are the main event in the United States; they - are organized by <a href="http://www.mikealrogers.com/">Mikeal Rogers</a>. - <a href="http://nodefest.jp/">NodeFest (東京Node学園祭)</a> - is organized by the <a href="http://nodejs.jp">Node.js - Japan user group</a>. <a - href="http://nodecamp.de/">NodeCamp.de</a> in Cologne, - Germany is organized by <a href="railslove.de">Rails - Love</a>. An <a href="http://nodejsconf.it/">Italian - Node.js Conference</a> exists as well. <a - href="http://nodesummit.com/">Node Summit</a> is a - conference in San Francisco focusing on the adoption of - Node in larger companies. <a - href="http://jsconf.com/">JSConf</a> organizes the main - JavaScript conferences.</p> + <div class="row clearfix"> + <div class="block"> + <h2 class="mailing">Mailing Lists</h2> + + <p>The <a + href="http://groups.google.com/group/nodejs">user + mailing list</a> is used for announcements, discussion, + and flame wars about Node. The <a + href="http://groups.google.com/group/nodejs-dev">internal + development mailing list</a> is used for discussion of + internal design and feature proposals.</p> + </div> + + <div class="block"> + <h2 class="periodicals">Periodicals</h2> + + <p> <a + href="http://planetnodejs.com">Planet Node</a> is an + aggregator of Node developer blogs.</p><p><a + href="http://nodeup.com/">NodeUp</a> + is a podcast covering the latest Node news in the + community. </p> + </div> + </div> + + <div class="row clearfix"> + <div class="block"> + <h2 class="conferences">Conferences</h2> + + <p><a href="http://www.nodeconf.com/">NodeConf</a> + conferences are the main event in the United States; they + are organized by <a href="http://www.mikealrogers.com/">Mikeal Rogers</a>.</p> + <p><a href="http://nodefest.jp/">NodeFest (東京Node学園祭)</a> + is organized by the <a href="http://nodejs.jp">Node.js + Japan user group</a>.</p> + <p><a href="http://nodecamp.de/">NodeCamp.de</a> in Cologne, + Germany is organized by <a href="railslove.de">Rails Love</a>.</p> + <p>An <a href="http://nodejsconf.it/">Italian + Node.js Conference</a> exists as well.</p> + <p><a href="http://nodesummit.com/">Node Summit</a> is a + conference in San Francisco focusing on the adoption of + Node in larger companies.</p> + <p><a href="http://jsconf.com/">JSConf</a> organizes the main + JavaScript conferences.</p> + </div> + + <div class="block"> + <h2 class="localized">Localized Sites</h2> + + <p><code>nodejs.org</code> does not maintain any + translations into other languages. However there are + community websites in various languages with mailing lists + and translations of the website.</p> + + <p><a href="http://nodejs.ru/">nodejs.ru</a> Russian blog. + <br> + <a href="http://nodejs.ir">nodejs.ir</a> Iran group in Persian + <br> + <a href="http://nodejs.jp/">nodejs.jp</a> Japan user group + <br> + <a href="http://cnodejs.org">CNodeJS.org</a> Chinese community + <br> + <a href="http://nodejs.co.il">nodejs.co.il</a> Israeli wiki + <br> + <a href="http://nodejs.hk">HKNoJ</a> Hong Kong community + <br> + <a href="http://nodejs.tw">nodejs.tw</a> Taiwan community</p> + </div> + </div> + + <div class="row clearfix"> + <div class="block"> + <h2 class="irc">IRC</h2> + + <p>For real-time chat about Node development go to + <code>irc.freenode.net</code> in the <code>#node.js</code> + channel with an <a href="http://www.mirc.com">IRC</a> <a + href="http://colloquy.info/">client</a> or connect in + your web browser to the channel using <a + href="http://webchat.freenode.net/?channels=node.js">freenode's + WebChat</a>. Felix Geisendörfer keeps <a + href="http://nodejs.debuggable.com/">logs of the + channel</a> for those who miss a day.</p> + </div> + </div> - <h2>Localized Sites</h2> - - <p><code>nodejs.org</code> does not maintain any - translations into other languages. However there are - community websites in various languages with mailing lists - and translations of the website.</p> - - <p><a href="http://nodejs.ru/">nodejs.ru</a> Russian blog. - <br> - <a href="http://nodejs.ir">nodejs.ir</a> Iran group in Persian - <br> - <a href="http://nodejs.jp/">nodejs.jp</a> Japan user group - <br> - <a href="http://cnodejs.org">CNodeJS.org</a> Chinese community - <br> - <a href="http://nodejs.co.il">nodejs.co.il</a> Israeli wiki - <br> - <a href="http://nodejs.hk">HKNoJ</a> Hong Kong community - <br> - <a href="http://nodejs.tw">nodejs.tw</a> Taiwan community</p> - <p><a href="/">Go back to the home page</a></p> + <p><a href="http://notinventedhe.re/on/2011-7-26"><img + src="not-invented-here.png" width="100%"></a></p> </div> - <div id="column2" class="interior"> - </div> </div> <div id="footer"> - <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js - is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>. + <ul class="clearfix"> + <li><a href="/">Node.js</a></li> + <li><a href="/#download">Download</a></li> + <li><a href="/about/">About</a></li> + <li><a href="http://search.npmjs.org/">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li> + <li><a href="http://blog.nodejs.org">Blog</a></li> + <li><a href="/community/">Community</a></li> + <li><a href="/logos/">Logos</a></li> + <li><a href="http://jobs.nodejs.org/">Jobs</a></li> + <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> + </ul> + + <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.8/LICENSE">license</a>.</p> </div> <script> diff --git a/doc/ebay-logo.png b/doc/ebay-logo.png Binary files differindex 8cb3db006d3..8a51935dd93 100644 --- a/doc/ebay-logo.png +++ b/doc/ebay-logo.png diff --git a/doc/index.html b/doc/index.html index 3769002f911..7b4bc68748a 100644 --- a/doc/index.html +++ b/doc/index.html @@ -31,6 +31,7 @@ <a href="#download" class="button" id="downloadbutton">Download</a> <a href="http://nodejs.org/docs/latest/api/index.html" class="button" id="docsbutton">Docs</a> + <p class="version">v0.6.6</p> </div> <div id="quotes" class="clearfix"> <h2>Node.js in the Industry</h2> @@ -197,10 +198,23 @@ server.listen(1337, "127.0.0.1");</pre> </div> <div id="footer"> - <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js - is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>. + <ul class="clearfix"> + <li><a href="/">Node.js</a></li> + <li><a href="/#download">Download</a></li> + <li><a href="/about/">About</a></li> + <li><a href="http://search.npmjs.org/">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li> + <li><a href="http://blog.nodejs.org">Blog</a></li> + <li><a href="/community/">Community</a></li> + <li><a href="/logos/">Logos</a></li> + <li><a href="http://jobs.nodejs.org/">Jobs</a></li> + <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> + </ul> + + <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.8/LICENSE">license</a>.</p> </div> + <script src="sh_main.js"></script> <script src="sh_javascript.min.js"></script> <script>highlight(undefined, undefined, 'pre');</script> diff --git a/doc/logos/index.html b/doc/logos/index.html index 35c575cb551..dab67fce599 100644 --- a/doc/logos/index.html +++ b/doc/logos/index.html @@ -22,14 +22,29 @@ <title>node.js</title> </head> <body> - <div id="intro"> + <div id="intro" class="interior"> <a href="/" title="Go back to the home page"> <img id="logo" src="../logo.png" alt="node.js"> </a> </div> <div id="content" class="clearfix"> + <div id="column2" class="interior"> + <ul> + <li><a href="/" class="home">Home</a></li> + <li><a href="/#download" class="download">Download</a></li> + <li><a href="/about/" class="about">About</a></li> + <li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html" class="docs">Docs</a></li> + <li><a href="http://blog.nodejs.org" class="blog">Blog</a></li> + <li><a href="/community/" class="community">Community</a></li> + <li><a href="/logos/" class="logos current">Logos</a></li> + <li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li> + </ul> + <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p> + + </div> + <div id="column1" class="interior"> - <p>To echo the evolutionary nature of Node, we've added some punch and playfulness to its identity. All it needs now is a good home with you, download and have fun!</p> <h2>Logo Downloads</h2> <table border="0" cellspacing="0" cellpadding="10"> <tr> @@ -54,17 +69,28 @@ <p>Select your screen resolution:<a href="nodejs-1024x768.png"><br> <span class="desktops">1024 x 768</span></a><span class="desktops"> | <a href="nodejs-1280x1024.png">1280 x 1024</a> | <a href="nodejs-1440x900.png">1440 x 900</a> | <a href="nodejs-1920x1200.png">1920 x 1200</a> | <a href="nodejs-2560x1440.png">2560 x 1440</a></span></p> - <p><a href="/">Go back to the home page</a></p> </div> - <div id="column2" class="interior"> - </div> </div> <div id="footer"> + <ul class="clearfix"> + <li><a href="/">Node.js</a></li> + <li><a href="/#download">Download</a></li> + <li><a href="/about/">About</a></li> + <li><a href="http://search.npmjs.org/">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li> + <li><a href="http://blog.nodejs.org">Blog</a></li> + <li><a href="/community/">Community</a></li> + <li><a href="/logos/">Logos</a></li> + <li><a href="http://jobs.nodejs.org/">Jobs</a></li> + <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> + </ul> + <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.6.8/LICENSE">View License</a></p> </div> + <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); diff --git a/doc/pipe.css b/doc/pipe.css index 3da6d120a92..09f0a8bb30d 100644 --- a/doc/pipe.css +++ b/doc/pipe.css @@ -13,6 +13,11 @@ body { border-top: 6px #8cc84b solid; } +body.alt { + background: white; + color: #46483e; +} + img { border: 0; } @@ -29,6 +34,15 @@ h1, h2, h3, h4 { margin-left: 0; text-transform: uppercase; } +h1 { + font-family: Georgia, FreeSerif, Times, serif; + font-size: 30px; + line-height: 36px; + text-transform: none; + color: #669900; + font-weight: normal; + margin-top: 1em; +} h2 { font-size: 12px; @@ -62,15 +76,24 @@ h1 a, h2 a, h3 a, h4 a font-size: 14px; } +#intro.interior #logo { + margin-left: -130px; +} + +#intro p.version { + padding-top: 10px; + font-size: 12px; +} + #intro .button { font-weight: bold; font-size: 14px; text-transform: uppercase; - padding: 7px 10px; + padding: 6px 12px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - margin: 0 5px; + margin: 0 1px; color: #46483e; } @@ -87,7 +110,7 @@ h1 a, h2 a, h3 a, h4 a } #intro #docsbutton { - background-color: #d2d8ba; + background-color: #9a9f8b; } #intro #docsbutton:hover { @@ -141,30 +164,146 @@ h1 a, h2 a, h3 a, h4 a } #content { - width: 775px; + width: 800px; margin: 0 auto; + overflow: visible; + clear: both; + display: block; } -#content #column1 { - width: 420px; +#column1 { + width: 460px; float: left; } -#content #column2 { +#content p { + font-size: 14px; +} + +#content h1 + p { + font-size: 18px; + line-height: 30px; + color: #46483e; + font-family: Georgia, FreeSerif, Times, serif; +} + +#column2 { width: 260px; float: right; } -#content #column1.interior { - width: 510px; +#column1.interior { + width: 590px; float: right; + padding-top: 20px; +} + +#column2.interior { + width: 160px; + float: left; + margin-top: -50px; + overflow: visible; } -#content #column2.interior { +#column2.interior li { + list-style-type: none; +} + +#column2.interior li a { + display: block; + padding: 1px 0px 1px 40px; + color: #878b78; + text-transform: uppercase; +} + +#column2.interior li a.home { background: url(icons-interior.png) no-repeat -158px 3px; } +#column2.interior li a.download { background: url(icons-interior.png) no-repeat -158px -21px; } +#column2.interior li a.about { background: url(icons-interior.png) no-repeat -158px -44px; } +#column2.interior li a.npm { background: url(icons-interior.png) no-repeat -158px -70px; } +#column2.interior li a.docs { background: url(icons-interior.png) no-repeat -158px -93px; } +#column2.interior li a.blog { background: url(icons-interior.png) no-repeat -158px -117px; } +#column2.interior li a.community { background: url(icons-interior.png) no-repeat -158px -140px; } +#column2.interior li a.logos { background: url(icons-interior.png) no-repeat -158px -164px; } +#column2.interior li a.jobs { background: url(icons-interior.png) no-repeat -158px -189px; } + +#column2.interior li a.home.current { background-position: left 3px; } +#column2.interior li a.download.current { background-position: left -21px; } +#column2.interior li a.about.current { background-position: left -44px; } +#column2.interior li a.npm.current { background-position: left -70px; } +#column2.interior li a.docs.current { background-position: left -93px; } +#column2.interior li a.blog.current { background-position: left -117px; } +#column2.interior li a.community.current { background-position: left -140px; } +#column2.interior li a.logos.current { background-position: left -164px; } +#column2.interior li a.jobs.current { background-position: left -189px; } +#column2.interior li a.current { color: #8cc84b; font-weight: bold; } + +#column2.interior li a.home:hover { background-position: -333px 3px; } +#column2.interior li a.download:hover { background-position: -333px -21px; } +#column2.interior li a.about:hover { background-position: -333px -44px; } +#column2.interior li a.npm:hover { background-position: -333px -70px; } +#column2.interior li a.docs:hover { background-position: -333px -93px; } +#column2.interior li a.blog:hover { background-position: -333px -117px; } +#column2.interior li a.community:hover { background-position: -333px -140px; } +#column2.interior li a.logos:hover { background-position: -333px -164px; } +#column2.interior li a.jobs:hover { background-position: -333px -189px; } +#column2.interior li a:hover { color: #000000; text-decoration: none; } + +#column2.interior li + li { + border-top: 1px solid #c1c7ac; +} + +#column2.interior p.twitter { + padding-top: 20px; +} + +#column2.interior p.twitter a { + background: url(twitter-bird.png) no-repeat 0 4px; + padding-left: 37px; +} + +.row { + padding-top: 20px; + padding-bottom: 20px; +} + +.row + .row { + border-top: 1px solid #626557; +} + +.row h2 { + font-size: 24px; + color: white; + text-transform: none; + font-family: Georgia, FreeSerif, Times, serif; + background: url(community-icons.png) no-repeat; + padding-left: 45px; + padding-top: 6px; + padding-bottom: 10px; + margin-top: 10px; +} + +.row h2.github { background-position: left -92px; } +.row h2.mailing { background-position: left -308px; } +.row h2.periodicals { background-position: left -198px; padding-top: 9px; margin-top: 7px; } +.row h2.conferences { background-position: left -522px; } +.row h2.localized { background-position: left -414px; } +.row h2.irc { background-position: left -626px; } + +.block { + width: 280px; + float: left; +} + +.block + .block { + margin-left: 30px; +} + +#content .block p { + font-size: 12px; } #explore { - background: url(icons.png) no-repeat left 15px; + background: url(home-icons.png) no-repeat left 11px; } #explore li { @@ -209,16 +348,54 @@ h1 a, h2 a, h3 a, h4 a #footer p { color: #8BC84B; - height: 32px; - padding-top: 3px; - background: url(footer-logo.png) left top no-repeat; - padding-left: 130px; + font-size: 10px; + padding-left: 195px; + color: #878b78; } #footer p a { text-decoration: underline; + color: #878b78; +} + +#footer ul { + background: url(footer-logo.png) left top no-repeat; + padding-left: 195px; + height: 26px; + padding-top: 6px; +} +.alt #footer ul { + background-image: url(footer-logo-alt.png); +} + +#footer ul li { + list-style-type: none; + display: block; + float: left; +} + +#footer ul li a { + margin: 0; + padding: 0; } +#footer ul li + li { + height: 12px; + margin-left: 3px; +} + +#footer ul li + li a { + padding: 0 0 0 4px; + border-left: 1px solid #878b78; +} + +#footer ul li a.twitter { + background: url(twitter-bird.png) no-repeat 0 2px; + padding-left: 19px; +} + + + div#download { position: absolute; width: 580px; @@ -326,17 +503,41 @@ pre { border-left-color: #626557; } +.alt pre { + font-size: 14px; + margin-left: 0; + border-left: 2px solid #dadad7; + background-color: #f4f4f2; + color: #46483e; + padding: 1em 1.5em; + line-height: 2em; +} + +.alt code { + color: #996633; +} + dd { margin: 1em 0; margin-left: 1em; } + a { color: #8BC84B; text-decoration: none; } a:hover { text-decoration: underline; } +.alt a { + background-color: #eff2db; + padding: 0 2px; +} + +.alt #intro a, .alt #footer a { + background-color: transparent; +} + .highlight { background: #733; padding: 0.2em 0; @@ -350,12 +551,11 @@ a:hover { text-decoration: underline; } } /* simpler clearfix */ -.clearfix { - /* be an independent layout island */ - overflow:hidden; - /* but don't actually cut anything off */ - height:auto; - /* trigger hasLayout in IE */ - zoom:1; - /* fin. */ +.clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } + diff --git a/doc/sh_vim-dark.css b/doc/sh_vim-dark.css index 59b30215725..a915a7875dd 100644 --- a/doc/sh_vim-dark.css +++ b/doc/sh_vim-dark.css @@ -21,3 +21,13 @@ .sh_sourceCode .sh_comment { color: #777; } + +.alt .sh_sourceCode .sh_keyword { + font-style: normal; + color: #996633; +} + +.alt .sh_sourceCode .sh_symbol , .alt .sh_sourceCode .sh_cbracket { + color: #46483e; +} + diff --git a/doc/template.html b/doc/template.html index 52b0d26df62..3af3fefe8cb 100644 --- a/doc/template.html +++ b/doc/template.html @@ -7,17 +7,56 @@ <link rel="stylesheet" href="assets/sh.css"> <link rel="canonical" href="http://nodejs.org/docs/latest/api/{{filename}}.html"> </head> -<body> - <div id="container"> - <header> - <h1>Node.js v0.6.8 Manual & Documentation</h1> - <div id="gtoc"> - <p><a href="index.html">Index</a> | <a href="all.html">View on single page</a></p> - </div> - <hr> - </header> - {{content}} - </div> +<body class="alt"> + <div id="intro" class="interior"> + <a href="/" title="Go back to the home page"> + <img id="logo" src="assets/logo-light.png" alt="node.js"> + </a> + </div> + <div id="content" class="clearfix"> + <div id="column2" class="interior"> + <ul> + <li><a href="/" class="home">Home</a></li> + <li><a href="/#download" class="download">Download</a></li> + <li><a href="/about/" class="about">About</a></li> + <li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html" class="docs current">Docs</a></li> + <li><a href="http://blog.nodejs.org" class="blog">Blog</a></li> + <li><a href="/community/" class="community">Community</a></li> + <li><a href="/logos/" class="logos">Logos</a></li> + <li><a href="http://jobs.nodejs.org/" class="jobs">Jobs</a></li> + </ul> + <p class="twitter"><a href="http://twitter.com/nodejs">@nodejs</a></p> + </div> + + <div id="column1" class="interior"> + <header> + <h1>Node.js v0.6.7 Manual & Documentation</h1> + <div id="gtoc"> + <p><a href="index.html" name="toc">Index</a> | <a href="all.html">View on single page</a></p> + </div> + <hr> + </header> + {{content}} + </div> + </div> + <div id="footer"> + <ul class="clearfix"> + <li><a href="/">Node.js</a></li> + <li><a href="/#download">Download</a></li> + <li><a href="/about/">About</a></li> + <li><a href="http://search.npmjs.org/">npm Registry</a></li> + <li><a href="http://nodejs.org/docs/latest/api/index.html">Docs</a></li> + <li><a href="http://blog.nodejs.org">Blog</a></li> + <li><a href="/community/">Community</a></li> + <li><a href="/logos/">Logos</a></li> + <li><a href="http://jobs.nodejs.org/">Jobs</a></li> + <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> + </ul> + + <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.8/LICENSE">license</a>.</p> + </div> + <script src="assets/sh_main.js"></script> <script src="assets/sh_javascript.min.js"></script> <script>highlight(undefined, undefined, 'pre');</script> |