Merge pull request #1 from bstrie/forkme

brson · brson · commit 308168a2cc6b · 2012-09-19T23:46:11.000-07:00
Fix Github ribbon and add new highlighted code example
diff --git a/codemirror.css b/codemirror.css
@@ -0,0 +1,69 @@
+.cm-s-default span.cm-keyword {
+    color: #770088;
+}
+.cm-s-default span.cm-atom {
+    color: #221199;
+}
+.cm-s-default span.cm-number {
+    color: #116644;
+}
+.cm-s-default span.cm-def {
+    color: #0000FF;
+}
+.cm-s-default span.cm-variable {
+    color: black;
+}
+.cm-s-default span.cm-variable-2 {
+    color: #0055AA;
+}
+.cm-s-default span.cm-variable-3 {
+    color: #008855;
+}
+.cm-s-default span.cm-property {
+    color: black;
+}
+.cm-s-default span.cm-operator {
+    color: black;
+}
+.cm-s-default span.cm-comment {
+    color: #AA5500;
+}
+.cm-s-default span.cm-string {
+    color: #AA1111;
+}
+.cm-s-default span.cm-string-2 {
+    color: #FF5500;
+}
+.cm-s-default span.cm-meta {
+    color: #555555;
+}
+.cm-s-default span.cm-error {
+    color: #FF0000;
+}
+.cm-s-default span.cm-qualifier {
+    color: #555555;
+}
+.cm-s-default span.cm-builtin {
+    color: #3300AA;
+}
+.cm-s-default span.cm-bracket {
+    color: #999977;
+}
+.cm-s-default span.cm-tag {
+    color: #117700;
+}
+.cm-s-default span.cm-attribute {
+    color: #0000CC;
+}
+.cm-s-default span.cm-header {
+    color: blue;
+}
+.cm-s-default span.cm-quote {
+    color: #009900;
+}
+.cm-s-default span.cm-hr {
+    color: #999999;
+}
+.cm-s-default span.cm-link {
+    color: #0000CC;
+}
diff --git a/index.html b/index.html
@@ -6,6 +6,7 @@
   <title>Rust</title>
 
   <link rel="stylesheet" href="bootstrap.min.css">
+  <link rel="stylesheet" href="codemirror.css">
   <style type="text/css">
     div.container {
     margin-top: 30px;
@@ -43,7 +44,7 @@
 </head>
 
 <body>
-<a href="http://github.com/mozilla/rust"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/assets.github.com/img/71eeaab9d563c2b3c590319b398dd35683265e85/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67" alt="Fork me on GitHub"></a>
+<a href="https://github.com/mozilla/rust"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
   <div class="container">
     <div id="nav" class="row">
       <div class="span3">
@@ -147,12 +148,15 @@ <h1>Rust <small>a safe, concurrent, practical language</small></h1>
 	  <div class="span3"><h2>A very small taste of what it looks like</h2></div>
 
 	  <div class="span10">
-<pre class="code">
-import io::println;
-
-fn main() {
-    for 5.times {
-        println("Here's some Rust!");
+<pre class="cm-s-default">
+<span class="cm-keyword">fn</span> <span class="cm-def">main</span>() {
+    <span class="cm-keyword">for</span> [<span class="cm-string">"Alice"</span>, <span class="cm-string">"Bob"</span>, <span class="cm-string">"Carol"</span>].<span class="cm-variable">each</span> |<span class="cm-variable">name</span>| {
+        <span class="cm-keyword">do</span> <span class="cm-variable-2">task::</span><span class="cm-variable">spawn</span> {
+            <span class="cm-keyword">let</span> <span class="cm-def">v</span> = <span class="cm-variable-2">rand::</span><span class="cm-variable">Rng</span>().<span class="cm-variable">shuffle</span>([<span class="cm-number">1</span>, <span class="cm-number">2</span>, <span class="cm-number">3</span>]);
+            <span class="cm-keyword">for</span> <span class="cm-variable">v</span>.<span class="cm-variable">each</span> |<span class="cm-variable">num</span>| {
+                <span class="cm-variable-2">io::</span><span class="cm-variable">print</span>(<span class="cm-variable-3">fmt!</span>(<span class="cm-string">"%s says: '%d'\n"</span>, <span class="cm-variable">name</span>, <span class="cm-variable">num</span>))
+            }
+        }
     }
 }
 </pre>
