Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of http://github.com/ncb000gt/howtonode.org int…

…o ncb000gt-master
  • Loading branch information...
commit 5281645ad86b3826168518e61603287c4abc3f00 2 parents 6f7d3e5 + 80517bb
@creationix creationix authored
View
68 skin/article.haml
@@ -1,6 +1,36 @@
+#main.clearfix
+ :if article.version
+ %a.sha-version{ href: "/#{article.version}/#{article.name}" } Static Version
+ %h1
+ %a{href: "/" + article.name}&= article.title
+ = markdownEncode(article.markdown)
+ %hr{style:"clear:both"}
+ #disqus_thread.body
+ :script
+ var disqus_url = "http://howtonode.org/#{article.name}";
+ %script(src="http://disqus.com/forums/howtonodeorg/embed.js" type="text/javascript")
+ %a(href="http://disqus.com/forums/howtonodeorg/?url=ref")
+ View the discussion thread.
+ %a.dsq-brlink(href="http://disqus.com")
+ blog comments powered by
+ %span.logo-disqus
+ Disqus
+ :script
+ (function() {
+ var links = document.getElementsByTagName('a');
+ var query = '?';
+ for(var i = 0; i < links.length; i++) {
+ if(links[i].href.indexOf('#disqus_thread') >= 0) {
+ query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&amp;';
+ }
+ }
+ document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/howtonodeorg/get_num_replies.js' + query + '"></' + 'script>');
+ })();
+
+
#sidebar
.aside.clearfix
- %h3 About the Author
+ %h4 About the Author
%img.headshot{src: gravitar(author.email) }
%dl
%dt Name:
@@ -28,7 +58,7 @@
%a{href: author.homepage} Homepage
.aside
- %h3
+ %h4
About this Article
:if article.date
%dl{title: article.date}
@@ -85,7 +115,7 @@
:if article.related && article.related.length > 0
.bubble
- %h3
+ %h4
Other Articles by this Author
%ul
:each related in article.related
@@ -96,34 +126,4 @@
.bubble= markdownEncode(description)
%a.sponsor{href:"http://mediatemple.net/"}
- %img{src:"mtbadge.jpg", alt:"(mt) mediatemple", title:"Hosting donated by Media Temple"}
-
-
-#main.clearfix
- :if article.version
- %a.sha-version{ href: "/#{article.version}/#{article.name}" } Static Version
- %h1
- %a{href: "/" + article.name}&= article.title
- = markdownEncode(article.markdown)
- %hr{style:"clear:both"}
- #disqus_thread.body
- :script
- var disqus_url = "http://howtonode.org/#{article.name}";
- %script(src="http://disqus.com/forums/howtonodeorg/embed.js" type="text/javascript")
- %a(href="http://disqus.com/forums/howtonodeorg/?url=ref")
- View the discussion thread.
- %a.dsq-brlink(href="http://disqus.com")
- blog comments powered by
- %span.logo-disqus
- Disqus
- :script
- (function() {
- var links = document.getElementsByTagName('a');
- var query = '?';
- for(var i = 0; i < links.length; i++) {
- if(links[i].href.indexOf('#disqus_thread') >= 0) {
- query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&amp;';
- }
- }
- document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/howtonodeorg/get_num_replies.js' + query + '"></' + 'script>');
- })();
+ %img{src:"mtbadge.jpg", alt:"(mt) mediatemple", title:"Hosting donated by Media Temple"}
View
31 skin/index.haml
@@ -1,8 +1,21 @@
+#main.clearfix
+ :each article in articles.slice(0,15)
+ .article
+ .author
+ %img{src:gravitar(article.author.email, 30)}
+ By #{article.author.name}
+ .date{title: article.date}&= formatDate(article.date, "%Y.%m.%d")
+ %h3{style: "margin-right: 150px"}
+ %a{href: "/" + article.name}&= article.title
+ %p
+ = intro(article.markdown)
+ %a{href: "/" + article.name} Read more...
+
#sidebar
.aside
= markdownEncode(description)
.bubble
- %h3
+ %h4
Articles
%ul
:each article in articles.slice(0,20)
@@ -13,18 +26,4 @@
%span.versiontag&= article.node
.bubble= markdownEncode(description)
%a.sponsor{href:"http://mediatemple.net/"}
- %img{src:"mtbadge.jpg", alt:"(mt) mediatemple", title:"Hosting donated by Media Temple"}
-
-
-#main.clearfix
- :each article in articles.slice(0,15)
- .author
- %img{src:gravitar(article.author.email, 30)}
- By #{article.author.name}
- .date{title: article.date}&= formatDate(article.date, "%Y.%m.%d")
- %h1{style: "margin-right: 150px"}
- %a{href: "/" + article.name}&= article.title
- = intro(article.markdown)
- %a{href: "/" + article.name} Read more...
- %hr
-
+ %img{src:"mtbadge.jpg", alt:"(mt) mediatemple", title:"Hosting donated by Media Temple"}
View
13 skin/layout.haml
@@ -2,7 +2,8 @@
%html(lang="en" xmlns="http://www.w3.org/1999/xhtml")
%head
%meta(http-equiv="content-type" content="text/html; charset=UTF-8")
- %title #{(title ? title + " - " : "")}How To Node
+ %title #{(title ? title + " - " : "")}How To Node - NodeJS
+ %meta(name="description" content="Learn the zen of coding in NodeJS.")
%link(href="/volcano.css" rel="stylesheet")
%link(href="/print.css" rel="stylesheet" media="print")
%link(rel="alternate" type="application/rss+xml" title="RSS 2.0" href="/feed.xml")
@@ -13,13 +14,13 @@
%a{href: "/"}
%h1
How To Node
- .tagline
+ %h2.tagline
The zen of coding in node.JS
= content
- #footer
- Site Design and code is &copy; 2010 to Tim Caswell under the MIT license. Content and articles are copyrighted to the individual authors. All code snippets used in the examples are in the public domain.
- %br
- Wheat running on node #{process.version}
+
+ #footer.clearfix
+ %p Site Design and code is &copy; 2010 to Tim Caswell under the MIT license. Content and articles are copyrighted to the individual authors. All code snippets used in the examples are in the public domain.
+ %p Wheat running on node #{process.version}
:script
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
View
30 skin/public/volcano.css
@@ -52,7 +52,10 @@ body {
text-align: center;
color: #fff;
font-family: sans-serif;
- margin: 20px 0;
+ padding: 20px 0;
+}
+#footer.clearfix{
+ clear:both;
}
#main,
.aside,
@@ -63,11 +66,14 @@ body {
border: 1px solid rgba(255, 255, 255, 0.1);
}
#main {
+ float:left;
background-color: #fdfeff;
padding: 10px 30px;
- min-height: 400px;
- min-width: 400px;
- margin-right: 350px;
+ margin-right:0;
+ min-height: 300px;
+ min-width: 300px;
+ width: 65%;
+ /*margin-right: 350px;*/
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
@@ -189,6 +195,10 @@ body {
color: #444;
}
#main h3 {
+ font-size: 2em;
+ color: #222;
+}
+#main h4 {
color: #666;
}
/* Added the default paragraph style to
@@ -217,9 +227,15 @@ the list items to fix the size issue */
#main .code-link .hash {
font-weight: normal;
}
+.article {
+ padding-bottom:10px;
+ margin-bottom:7px;
+ border-bottom:1px solid #ddd;
+}
#sidebar {
- float: right;
- width: 350px;
+ margin-left:0;
+ float: left;
+ width: 28%;
font-family: sans-serif;
font-size: 14px;
line-height: 1.6em;
@@ -227,7 +243,7 @@ the list items to fix the size issue */
#sidebar dl {
margin: 10px 0;
}
-#sidebar h3 {
+#sidebar h4 {
font-size: 18px;
font-weight: bold;
line-height: 1em;
Please sign in to comment.
Something went wrong with that request. Please try again.