Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf

packages/mcp/www/ctf.css

@@ -1,14 +1,36 @@
 /* green phosphor: #2a4 */
 
+/**** Color Scheme ****/
+html {
+    background: #112 url(smoke.jpg) no-repeat;
+    background-size: contain;
+}
+
+body, h1:first-child:before {
+    color: #ddc;
+}
+
+h1, h2, h3 {
+    color: #1dd;
+}
+
+a {
+    color: #f80;
+}
+
+a:hover {
+    color: #112;
+    background-color: #f80;
+}
+
+.readme, pre {
+    background-color: #333;
+}
+
 /**** document ****/
 
-html {
-    background: #112 url(grunge.png) repeat-x;
-}
-
 body {
     font-family: sans-serif;
-    color: #ddc;
     padding: 10px;
     max-width: 700px;
 }
@@ -23,7 +45,6 @@ h1:first-child {
 }
 
 h1:first-child:before {
-    color: #ddc;
     letter-spacing: -0.1em;
     content: "Capture The Flag: ";
 }
@@ -36,27 +57,17 @@ a img {
 
 a {
     text-decoration: underline;
-    color: #84b;
 }
 
-a:hover {
-    color: #2a4;
-    background: #333;
-}
-
-
 h1, h2, h3 {
-    color: #b71;
     letter-spacing: -0.05em;
 }
 
 .readme {
-    background-color: #333;
     margin: 1em;
 }
 
 pre {
-    background-color: #333;
     border: solid #ddc 2px;
     padding: 0.25em;
 }
@@ -123,10 +134,6 @@ nav li + li:before {
     text-align: center;
 }
 
-#scoreboard {
-    background: #112;
-}
-
 #scoreboard td {
     height: 300px;
 }

packages/mcp/www/index.html

@@ -27,7 +27,11 @@
     </ul>
 
     <h2>Claim Token</h2>
-    <p>Tokens look like <samp>foo:xabab-babab-babax</samp>.</p>
+    <p>
+      If you find a <a href="scoring.html#tokens">token</a>
+      (like <samp>example:xylep-radar-nanox</samp>), submit it here for
+      a point.
+    </p>
     <form action="claim.cgi" method="post">
       <fieldset>
         team hash:<input name="t" size="8">

packages/mcp/www/scoring.html

@@ -36,13 +36,13 @@
     </p>
 
 
-    <h2>Tokens</h2>
+    <h2 id="tokens">Tokens</h2>
     <p>
       Tokens are strings redeemable once for a single point each.  A
       token for the "example" category might look like this:
     </p>
 
-    <pre>example:xenon-codex</pre>
+    <pre>example:xylep-radar-nanox</pre>
 
     <p>
       Tokens are typically associated with "live" categories, such as a
@@ -83,7 +83,7 @@
     </p>
     <p>
       We want to focus on rewarding technical proficiency, allowing
-      skilled contestants to prove their worth independant of their
+      skilled contestants to prove their worth independent of their
       ability to hit F5 quickly.  It is our hope that by providing
       enough things to work on, quick-moving teams will emerge with more
       points by solving lots of puzzles, while novice teams get a solid