summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-01-23 02:12:20 -0800
committerisaacs <i@izs.me>2012-01-23 13:11:33 -0800
commit6768d2fc936ea4d8786897ea9c5c415efedb5b24 (patch)
tree206d52fe4289b00056cb3840534d9fa9d7045544
parent5c0d11b12a8214110bb78639daab452ce3d252e0 (diff)
downloadnode-new-6768d2fc936ea4d8786897ea9c5c415efedb5b24.tar.gz
doc: Pixel-nudging
-rw-r--r--doc/about/index.html6
-rw-r--r--doc/api_assets/style.css243
-rw-r--r--doc/community/index.html6
-rw-r--r--doc/index.html6
-rw-r--r--doc/logos/index.html4
-rw-r--r--doc/pipe.css200
-rw-r--r--doc/sh.css23
-rw-r--r--doc/template.html6
-rw-r--r--tools/doctool/doctool.js3
9 files changed, 321 insertions, 176 deletions
diff --git a/doc/about/index.html b/doc/about/index.html
index 549b8d6f03..5335539ff2 100644
--- a/doc/about/index.html
+++ b/doc/about/index.html
@@ -11,14 +11,14 @@
<link type="image/x-icon" rel="icon" href="../favicon.ico">
<link type="image/x-icon" rel="shortcut icon" href="../favicon.ico">
<link rel="stylesheet" href="../pipe.css">
- <link rel="stylesheet" href="../sh_vim-dark.css">
+ <link rel="stylesheet" href="../sh.css">
<link rel="alternate"
type="application/rss+xml"
title="node blog"
href="http://feeds.feedburner.com/nodejs/123123123">
<title>node.js</title>
</head>
- <body class="alt">
+ <body class="alt int" id="about">
<div id="intro" class="interior">
<a href="/" title="Go back to the home page">
<img id="logo" src="../logo-light.png" alt="node.js">
@@ -127,7 +127,7 @@ console.log('Server running at http://127.0.0.1:1337/');</pre>
<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>
+ <li><a href="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>
diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css
index b5665d53b7..6068455e3f 100644
--- a/doc/api_assets/style.css
+++ b/doc/api_assets/style.css
@@ -8,11 +8,11 @@ body {
font-size: 14px;
line-height: 180%;
color: black;
- margin: 0; padding: 40px 0 0 0;
+ margin: 0; padding: 49px 0 0 0;
border-top: 6px #8CC84B solid;
}
a {
- color: #669900;
+ color: #690;
text-decoration: underline;
}
a:visited {
@@ -22,7 +22,7 @@ a {
a:hover, a:focus {
text-decoration: none;
}
-
+
code a:hover {
background: none;
color: #b950b7;
@@ -32,9 +32,14 @@ a {
display: none;
}
+#gtoc p {
+ margin:0;
+ font-size:18px;
+ line-height: 30px;
+}
+
#gtoc a {
font-family: Georgia, FreeSerif, Times, serif;
- font-size: 16px;
text-decoration: none;
color: #46483e;
}
@@ -70,6 +75,13 @@ p {
text-rendering: optimizeLegibility;
}
+.apidoc p {
+ font-size: 15px;
+ line-height: 22px;
+ color: #000;
+ font-family: Georgia, FreeSerif, Times, serif;
+}
+
ol, ul, dl {
margin: 0 0 1em 0;
padding: 0;
@@ -105,7 +117,7 @@ dd + dt.pre {
}
h1, h2, h3, h4, h5, h6 {
- font-family: Helvetica, Arial, sans-serif
+ font-family: Helvetica, Arial, sans-serif;
color: #000;
text-rendering: optimizeLegibility;
position: relative;
@@ -116,17 +128,23 @@ h1 {
font-size: 30px;
font-weight: normal;
line-height: 36px;
- color: #669900;
+ color: #690;
+ margin: 15px 0 11px;
}
h2 {
- font-size: 1.9em;
- line-height: 1.227em;
- margin: 0 0 0.5em;
+ font-size: 29px;
+ line-height: 33px;
+ margin: 2em 0 15px;
+}
+
+#toc + h2 {
+ margin-top:1em;
+ padding-top:0;
}
h3 {
- font-size: 1.5em;
+ font-size: 1.4em;
line-height: 1.0909em;
margin: 1.5em 0 0.5em;
}
@@ -145,13 +163,35 @@ h4 + h4 {
margin: 0 0 0.5em;
}
- h3 a,
- h4 a {
+ h3, h4 {
+ position:relative;
+ padding-right:40px;
+ }
+ h2 span, h3 span, h4 span {
+ position:absolute;
+ display:block;
+ top:0;
+ right:0;
+ opacity: 0.3;
+ }
+ h2 span:hover, h3 span:hover, h4 span:hover {
+ opacity: 1;
+ }
+ h2 span a, h3 span a, h4 span a {
font-size: 0.8em;
- float: right;
color: #000;
text-decoration: none;
- opacity: 0.3;
+ font-family: Helvetica, Arial, sans-serif;
+ font-weight:bold;
+ }
+
+ h2 span a.top, h3 span a.top, h4 span a.top {
+ /* XXX Get an image and clean up these two links
+ * so that they look nice next to one another.
+ * http://www.chrisglass.com/work/nodejs/website/v05/docs.html
+ * -isaacs
+ */
+ display:none;
}
h5 {
@@ -165,7 +205,7 @@ h6 {
}
pre, tt, code {
- font-size: 0.95em;
+ font-size: 14px;
line-height: 1.5438em;
font-family: Monaco, Consolas, "Lucida Console", monospace;
margin: 0; padding: 0;
@@ -204,27 +244,31 @@ code.pre {
/* preload platform-icons.png */
background-image: url(platform-icons.png);
background-repeat: no-repeat;
- background-position: -1000px -1000px;
+ background-position: -999em -999em;
}
#intro.interior #logo {
- margin-left: -130px;
+ margin-left: -298px;
}
hr {
background: none;
border: medium none;
border-bottom: 1px solid #ccc;
- margin: 2em 0 2em;
+ margin: 1em 0;
}
#toc {
-
+ font-size:15px;
+ line-height:1.5em;
+ line-height: 22px;
+ padding-top:4px;
}
#toc h2 {
- font-size: 1em;
- line-height: 1.4em;
+ font-size: 15px;
+ line-height: 21px;
+ margin: 0 0 0.5em;
}
#toc h2 a {
@@ -235,34 +279,28 @@ hr {
margin: 1em 0 2em;
}
+ #toc ul {
+ font-family: Georgia, FreeSerif, Times, serif;
+ }
+
+ #toc ul a {
+ text-decoration:none;
+ border-bottom:1px dotted #690;
+ }
+ #toc ul a:hover, #toc ul a:focus {
+ border-bottom:1px dotted #fff;
+ color:#000;
+ }
+
+
p tt, p code {
background: #f8f8ff;
border: 1px solid #dedede;
padding: 0 0.2em;
}
-a.octothorpe {
- text-decoration: none;
- color: #777;
- position: absolute;
- top: 0; left: -1.4em;
- padding: 1px 2px;
- opacity: 0;
- -webkit-transition: opacity 0.2s linear;
-}
- p:hover > a.octothorpe,
- dt:hover > a.octothorpe,
- dd:hover > a.octothorpe,
- h1:hover > a.octothorpe,
- h2:hover > a.octothorpe,
- h3:hover > a.octothorpe,
- h4:hover > a.octothorpe,
- h5:hover > a.octothorpe,
- h6:hover > a.octothorpe {
- opacity: 1;
- }
#content {
- width: 800px;
+ width: 953px;
margin: 0 auto;
overflow: visible;
clear: both;
@@ -270,15 +308,17 @@ a.octothorpe {
}
#column1.interior {
- width: 590px;
+ width: 749px;
float: right;
- padding-top: 20px;
+ padding-top: 7px;
+ padding-top: 11px;
+ font-size:18px;
}
#column2.interior {
- width: 160px;
+ width: 140px;
float: left;
- margin-top: -50px;
+ margin-top: -55px;
overflow: visible;
}
@@ -292,44 +332,44 @@ a.octothorpe {
#column2.interior li a {
display: block;
- padding: 0 0 0 40px;
+ padding: 0 0 0 35px;
color: #878b78;
text-transform: uppercase;
text-decoration: none;
- font-size: 12px;
+ font-size: 11px;
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.home { background: url(icons-interior.png) no-repeat -156px 3px; }
+#column2.interior li a.download { background: url(icons-interior.png) no-repeat -156px -21px; }
+#column2.interior li a.about { background: url(icons-interior.png) no-repeat -156px -45px; }
+#column2.interior li a.npm { background: url(icons-interior.png) no-repeat -156px -69px; }
+#column2.interior li a.docs { background: url(icons-interior.png) no-repeat -156px -93px; }
+#column2.interior li a.blog { background: url(icons-interior.png) no-repeat -156px -117px; }
+#column2.interior li a.community { background: url(icons-interior.png) no-repeat -156px -141px; }
+#column2.interior li a.logos { background: url(icons-interior.png) no-repeat -156px -165px; }
+#column2.interior li a.jobs { background: url(icons-interior.png) no-repeat -156px -189px; }
+
+#column2.interior li a.home.current { background-position: 2px 3px; }
+#column2.interior li a.download.current { background-position: 2px -21px; }
+#column2.interior li a.about.current { background-position: 2px -45px; }
+#column2.interior li a.npm.current { background-position: 2px -69px; }
+#column2.interior li a.docs.current { background-position: 2px -93px; }
+#column2.interior li a.blog.current { background-position: 2px -117px; }
+#column2.interior li a.community.current { background-position: 2px -141px; }
+#column2.interior li a.logos.current { background-position: 2px -165px; }
+#column2.interior li a.jobs.current { background-position: 2px -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.home:hover { background-position: -331px 3px; }
+#column2.interior li a.download:hover { background-position: -331px -21px; }
+#column2.interior li a.about:hover { background-position: -331px -45px; }
+#column2.interior li a.npm:hover { background-position: -331px -69px; }
+#column2.interior li a.docs:hover { background-position: -331px -93px; }
+#column2.interior li a.blog:hover { background-position: -331px -117px; }
+#column2.interior li a.community:hover { background-position: -331px -141px; }
+#column2.interior li a.logos:hover { background-position: -331px -165px; }
+#column2.interior li a.jobs:hover { background-position: -331px -189px; }
#column2.interior li a:hover { color: #000000; text-decoration: none; }
#column2.interior li + li {
@@ -370,57 +410,70 @@ a.anchor {
border-bottom: 1px solid #cccccc;
}
#footer {
- width: 775px;
- border-top: 1px solid #626557;
- margin: 50px auto 30px auto;
- padding-top: 15px;
+ width: 942px;
+ margin: 150px auto 55px auto;
+ padding:0;
}
#footer p {
- color: #8BC84B;
- font-size: 10px;
- padding-left: 195px;
- color: #878b78;
+ font-size: 11px;
+ line-height:1em;
+ padding: 0 0 0 195px;
+ color: #666;
+ font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+}
+
+#footer a {
+ text-decoration:none;
+ border:none;
+ color: #690;
+}
+#footer a:hover {
+ color:#000;
}
#footer p a {
- text-decoration: underline;
+ border-bottom:1px dotted #690;
color: #878b78;
}
#footer ul {
- background: url(footer-logo-alt.png) left top no-repeat;
- padding-left: 195px;
+ background: url(footer-logo-alt.png) left 17px no-repeat;
+ padding: 23px 0 0 195px;
height: 26px;
- padding-top: 6px;
- margin-left: 0;
+ margin-left: -1px;
+ border-top: 1px solid #626557;
}
#footer ul li {
list-style-type: none;
- display: block;
float: left;
font-size: 12px;
+ margin:0!important;
+ padding:0;
+ height: 12px;
}
#footer ul li a {
margin: 0;
- padding: 0;
+ padding: 0 6px 0 0;
+ display: block;
+ height:12px;
+ line-height:12px;
}
#footer ul li + li {
- height: 12px;
margin-left: 3px;
}
#footer ul li + li a {
- padding: 0 0 0 4px;
+ padding: 0 6px 0 6px;
border-left: 1px solid #878b78;
}
#footer ul li a.twitter {
- background: url(twitter-bird.png) no-repeat 0 2px;
- padding-left: 19px;
+ background: url(twitter-bird.png) no-repeat 5px 0px;
+ padding-left: 25px;
}
/* simpler clearfix */
diff --git a/doc/community/index.html b/doc/community/index.html
index 13387987f4..cb93e21547 100644
--- a/doc/community/index.html
+++ b/doc/community/index.html
@@ -20,7 +20,7 @@
href="http://feeds.feedburner.com/nodejs/123123123">
<title>node.js</title>
</head>
- <body>
+ <body class="int" id="community">
<div id="intro" class="interior">
<a href="/" title="Go back to the home page">
<img id="logo" src="../logo.png" alt="node.js">
@@ -50,7 +50,7 @@
<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://nodejs.org/docs/latest/api">Official API docs</a> detail the node API.</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>
@@ -177,7 +177,7 @@
<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>
+ <li><a href="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>
diff --git a/doc/index.html b/doc/index.html
index 7b4bc68748..5a6c1e003b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -18,7 +18,7 @@
href="http://feeds.feedburner.com/nodejs/123123123">
<title>node.js</title>
</head>
- <body>
+ <body id="front">
<div id="intro">
<img id="logo" src="logo.png" alt="node.js">
@@ -31,7 +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>
+ <p class="version">v0.6.8</p>
</div>
<div id="quotes" class="clearfix">
<h2>Node.js in the Industry</h2>
@@ -208,7 +208,7 @@ server.listen(1337, "127.0.0.1");</pre>
<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>
+ <!-- <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>
diff --git a/doc/logos/index.html b/doc/logos/index.html
index dab67fce59..c6681b5cb2 100644
--- a/doc/logos/index.html
+++ b/doc/logos/index.html
@@ -21,7 +21,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>node.js</title>
</head>
- <body>
+ <body class="int" id="logos">
<div id="intro" class="interior">
<a href="/" title="Go back to the home page">
<img id="logo" src="../logo.png" alt="node.js">
@@ -82,7 +82,7 @@
<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>
+ <li><a href="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>
diff --git a/doc/pipe.css b/doc/pipe.css
index 09f0a8bb30..999161b77b 100644
--- a/doc/pipe.css
+++ b/doc/pipe.css
@@ -18,6 +18,10 @@ body.alt {
color: #46483e;
}
+body.int {
+ padding-top:49px;
+}
+
img {
border: 0;
}
@@ -41,7 +45,7 @@ h1 {
text-transform: none;
color: #669900;
font-weight: normal;
- margin-top: 1em;
+ margin: 15px 0 11px;
}
h2 {
@@ -65,7 +69,7 @@ h1 a, h2 a, h3 a, h4 a
/* preload platform-icons.png */
background-image: url(platform-icons.png);
background-repeat: no-repeat;
- background-position: -1000px -1000px;
+ background-position: -999em -999em;
}
#intro p {
@@ -77,7 +81,7 @@ h1 a, h2 a, h3 a, h4 a
}
#intro.interior #logo {
- margin-left: -130px;
+ margin-left: -298px;
}
#intro p.version {
@@ -163,13 +167,20 @@ h1 a, h2 a, h3 a, h4 a
font-size: 10px;
}
+#quotes ul li p {
+ color: #D2D8BA
+}
+
#content {
- width: 800px;
+ width: 775px;
margin: 0 auto;
overflow: visible;
clear: both;
display: block;
}
+.int #content {
+ width: 953px;
+}
#column1 {
width: 460px;
@@ -178,6 +189,10 @@ h1 a, h2 a, h3 a, h4 a
#content p {
font-size: 14px;
+ line-height:24px;
+}
+#front #content p {
+ font-size:12px;
}
#content h1 + p {
@@ -193,63 +208,76 @@ h1 a, h2 a, h3 a, h4 a
}
#column1.interior {
- width: 590px;
+ width: 600px;
float: right;
- padding-top: 20px;
+ padding-top: 11px;
+ font-size:18px;
+ padding-right:150px;
}
#column2.interior {
- width: 160px;
+ width: 140px;
float: left;
- margin-top: -50px;
+ margin-top: -54px;
overflow: visible;
}
+#column2.interior ul {
+ margin-left: 0;
+}
+
#column2.interior li {
list-style-type: none;
}
#column2.interior li a {
display: block;
- padding: 1px 0px 1px 40px;
+ padding: 0 0 0 35px;
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; }
+ text-decoration: none;
+ font-size: 11px;
+ line-height: 23px;
+}
+
+#column2.interior li a.home { background: url(icons-interior.png) no-repeat -156px 3px; }
+#column2.interior li a.download { background: url(icons-interior.png) no-repeat -156px -21px; }
+#column2.interior li a.about { background: url(icons-interior.png) no-repeat -156px -44px; }
+#column2.interior li a.npm { background: url(icons-interior.png) no-repeat -156px -69px; }
+#column2.interior li a.docs { background: url(icons-interior.png) no-repeat -156px -93px; }
+#column2.interior li a.blog { background: url(icons-interior.png) no-repeat -156px -117px; }
+#column2.interior li a.community { background: url(icons-interior.png) no-repeat -156px -141px; }
+#column2.interior li a.logos { background: url(icons-interior.png) no-repeat -156px -165px; }
+#column2.interior li a.jobs { background: url(icons-interior.png) no-repeat -156px -189px; }
+
+#column2.interior li a.home.current { background-position: 2px 3px; }
+#column2.interior li a.download.current { background-position: 2px -21px; }
+#column2.interior li a.about.current { background-position: 2px -45px; }
+#column2.interior li a.npm.current { background-position: 2px -69px; }
+#column2.interior li a.docs.current { background-position: 2px -93px; }
+#column2.interior li a.blog.current { background-position: 2px -117px; }
+#column2.interior li a.community.current { background-position: 2px -141px; }
+#column2.interior li a.logos.current { background-position: 2px -165px; }
+#column2.interior li a.jobs.current { background-position: 2px -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.home:hover { background-position: -331px 3px; }
+#column2.interior li a.download:hover { background-position: -331px -21px; }
+#column2.interior li a.about:hover { background-position: -331px -45px; }
+#column2.interior li a.npm:hover { background-position: -331px -69px; }
+#column2.interior li a.docs:hover { background-position: -331px -93px; }
+#column2.interior li a.blog:hover { background-position: -331px -117px; }
+#column2.interior li a.community:hover { background-position: -331px -141px; }
+#column2.interior li a.logos:hover { background-position: -331px -165px; }
+#column2.interior li a.jobs:hover { background-position: -331px -189px; }
#column2.interior li a:hover { color: #000000; text-decoration: none; }
#column2.interior li + li {
border-top: 1px solid #c1c7ac;
+ border-top:1px solid #65675c;
+}
+.alt #column2.interior li + li {
+ border-top: 1px solid #c1c7ac;
}
#column2.interior p.twitter {
@@ -262,8 +290,8 @@ h1 a, h2 a, h3 a, h4 a
}
.row {
- padding-top: 20px;
- padding-bottom: 20px;
+ padding-top: 10px;
+ padding-bottom: 10px;
}
.row + .row {
@@ -295,15 +323,17 @@ h1 a, h2 a, h3 a, h4 a
}
.block + .block {
- margin-left: 30px;
+ margin-left: 20px;
+ width: 300px;
}
#content .block p {
- font-size: 12px;
+ font-size: 13px;
+ line-height:21px;
}
#explore {
- background: url(home-icons.png) no-repeat left 11px;
+ background: url(home-icons.png) no-repeat left 17px;
}
#explore li {
@@ -340,29 +370,55 @@ h1 a, h2 a, h3 a, h4 a
}
#footer {
- width: 775px;
- border-top: 1px solid #626557;
- margin: 50px auto 30px auto;
- padding-top: 15px;
+ width: 942px;
+ margin: 150px auto 55px auto;
+ padding:0;
}
#footer p {
- color: #8BC84B;
- font-size: 10px;
- padding-left: 195px;
- color: #878b78;
+ font-size: 11px;
+ line-height:1em;
+ padding: 0 0 0 195px;
+ color: #666;
+ font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;
+}
+
+#front #footer {
+ width: 775px;
+ margin: 50px auto 30px auto;
+ padding-top: 15px;
+}
+#front #footer ul {
+ margin-right:0;
+ padding-right:0;
+}
+
+#footer a {
+ text-decoration:none;
+ border:none;
+ color: #690;
+}
+
+#footer a:hover {
+ color:#000;
+}
+#front #footer a:hover {
+ color:#fff;
}
#footer p a {
- text-decoration: underline;
+ border-bottom:1px dotted #690;
color: #878b78;
}
#footer ul {
- background: url(footer-logo.png) left top no-repeat;
+ background: url(footer-logo.png) left 17px no-repeat;
+ border-top: 1px solid #626557;
+ border-color:#90918b;
+ padding-top:23px;
padding-left: 195px;
height: 26px;
- padding-top: 6px;
+ margin-right:137px;
}
.alt #footer ul {
background-image: url(footer-logo-alt.png);
@@ -370,28 +426,32 @@ h1 a, h2 a, h3 a, h4 a
#footer ul li {
list-style-type: none;
- display: block;
float: left;
+ font-size: 12px;
+ margin:0!important;
+ height: 12px;
}
#footer ul li a {
margin: 0;
- padding: 0;
+ padding: 0 6px 0 0;
+ display: block;
+ height:12px;
+ line-height:12px;
}
#footer ul li + li {
- height: 12px;
margin-left: 3px;
}
#footer ul li + li a {
- padding: 0 0 0 4px;
+ padding: 0 6px 0 6px;
border-left: 1px solid #878b78;
}
#footer ul li a.twitter {
- background: url(twitter-bird.png) no-repeat 0 2px;
- padding-left: 19px;
+ background: url(twitter-bird.png) no-repeat 5px 0px;
+ padding-left: 25px;
}
@@ -489,11 +549,17 @@ div#download ul#documentation li a {
margin-bottom: 37px;
}
-pre, code {
- font-family: Monaco, 'Andale Mono', 'Lucida Console', 'Bitstream Vera Sans Mono', 'Courier New', monospace, serif;
- font-size: 12px;
- color: #d2d8ba;
-}
+ pre, tt, code {
+ color: #d2d8ba;
+ font-size: 14px;
+ line-height: 22px;
+ font-family: Monaco, Consolas, "Lucida Console", monospace;
+ margin: 0; padding: 0;
+ }
+ #front pre, #front tt, #front code {
+ font-size:12px;
+ line-height:22px;
+ }
pre {
padding-left: 1em;
@@ -524,7 +590,7 @@ dd {
a {
- color: #8BC84B;
+ color: #690;
text-decoration: none;
}
a:hover { text-decoration: underline; }
diff --git a/doc/sh.css b/doc/sh.css
new file mode 100644
index 0000000000..b9ed5a3036
--- /dev/null
+++ b/doc/sh.css
@@ -0,0 +1,23 @@
+.sh_sourceCode {
+ font-weight: normal;
+ font-style: normal;
+}
+
+.sh_sourceCode .sh_symbol , .sh_sourceCode .sh_cbracket {
+ color: #333;
+}
+
+.sh_sourceCode .sh_keyword {
+ color: #c96;
+}
+
+.sh_sourceCode .sh_string, .sh_sourceCode .sh_regexp, .sh_sourceCode .sh_number,
+.sh_sourceCode .sh_specialchar
+{
+ color: #690;
+}
+
+.sh_sourceCode .sh_comment {
+ color: #666;
+}
+
diff --git a/doc/template.html b/doc/template.html
index 3af3fefe8c..ccff0f27fe 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="assets/sh.css">
<link rel="canonical" href="http://nodejs.org/docs/latest/api/{{filename}}.html">
</head>
-<body class="alt">
+<body class="alt apidoc">
<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">
@@ -31,7 +31,7 @@
<div id="column1" class="interior">
<header>
- <h1>Node.js v0.6.7 Manual &amp; Documentation</h1>
+ <h1>Node.js v0.6.8 Manual &amp; 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>
@@ -51,7 +51,7 @@
<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>
+ <li><a href="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>
diff --git a/tools/doctool/doctool.js b/tools/doctool/doctool.js
index ca3f60958b..85acad2a36 100644
--- a/tools/doctool/doctool.js
+++ b/tools/doctool/doctool.js
@@ -129,6 +129,9 @@ if (argc > 3) {
output = output.replace("{{section}}", filename+" - ")
} else {
+ if (filename === "index") {
+ html = '<div id="toc">' + html + '</div>';
+ }
output = output.replace("{{section}}", "");
output = output.replace(/<body([^>]*)>/, '<body class="'+filename+'" $1>');
}