# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1297034806 18000
# Node ID e674574f326054c7285d17fae5ab076fe3926b92
# Parent  9c925e190ed9fe5ce35a9a939cd795094dd296aa# Parent  aa90f23e2ab6c125a77c71f8b6e60181251ab81b
Merge.

diff -r 9c925e190ed9 -r e674574f3260 media/css/sjl.less
--- a/media/css/sjl.less	Sun Feb 06 18:26:27 2011 -0500
+++ b/media/css/sjl.less	Sun Feb 06 18:26:46 2011 -0500
@@ -151,12 +151,12 @@
 .splash {
     color: #454545;
     text-align: center;
-    font: normal 45px/50px @font-fancy;
+    font: normal 27px/32px @font-fancy;
     margin-bottom: -1px;
-    padding-top: 25px;
+    padding-top: 0;
 
     p {
-        margin-bottom: 50px;
+        margin-bottom: 24px;
     }
     .amp {
         font-style: italic;
diff -r 9c925e190ed9 -r e674574f3260 requirements.txt
--- a/requirements.txt	Sun Feb 06 18:26:27 2011 -0500
+++ b/requirements.txt	Sun Feb 06 18:26:46 2011 -0500
@@ -4,7 +4,7 @@
 -e svn+http://svn.cherrypy.org/tags/cherrypy-3.2.0rc1#egg=cherrypy
 -e git://gitorious.org/python-markdown/mainline.git#egg=markdown
 
-pyYAML
+PyYAML
 smartypants
 Pygments
-PIL
\ No newline at end of file
+PIL