# HG changeset patch # User Steve Losh # Date 1261525566 18000 # Node ID c657cf8e628638d279ff4703cc08bcd2e215ca48 # Parent 0b9e27b26ffa862c875865dcdcc3bed478bf149e Start fixing the splash page. diff -r 0b9e27b26ffa -r c657cf8e6286 content/index.html --- a/content/index.html Tue Dec 22 18:26:34 2009 -0500 +++ b/content/index.html Tue Dec 22 18:46:06 2009 -0500 @@ -1,4 +1,4 @@ -{% extends "skeleton/_index.html" %} +{% extends "_splash.html" %} {% hyde title: "" diff -r 0b9e27b26ffa -r c657cf8e6286 layout/_splash.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/layout/_splash.html Tue Dec 22 18:46:06 2009 -0500 @@ -0,0 +1,13 @@ +{% extends "skeleton/_base.html" %} + +{% block content %} +
+ +
+{% endblock %} \ No newline at end of file diff -r 0b9e27b26ffa -r c657cf8e6286 layout/skeleton/_base.html --- a/layout/skeleton/_base.html Tue Dec 22 18:26:34 2009 -0500 +++ b/layout/skeleton/_base.html Tue Dec 22 18:46:06 2009 -0500 @@ -30,24 +30,26 @@ - +
+ - + -
- {% block content %}{% endblock %} +
+ {% block content %}{% endblock %} +
diff -r 0b9e27b26ffa -r c657cf8e6286 media/css/base.css --- a/media/css/base.css Tue Dec 22 18:26:34 2009 -0500 +++ b/media/css/base.css Tue Dec 22 18:46:06 2009 -0500 @@ -1,3 +1,4 @@ +/* @override http://localhost:8080/media/css/base.css */ * { margin: 0; padding: 0; @@ -10,6 +11,11 @@ line-height: 2em; } +div#main-wrap { + width: 60em; + margin: 0 auto; +} + h1 {font-size: 4em; line-height: 72px; font-weight: bold;} h2 {font-size: 2em; line-height: 2em; font-weight: bold;} h3 {font-size: 1.5em; line-height: 2em; font-weight: bold;} @@ -41,52 +47,47 @@ list-style-position: inside; } -#header { - height: 10em; -} #header h1 { - margin: 0; - padding: 1em 0 0 0.5em; - line-height: 0; + line-height: 1.5em; font-size: 4em; - color: black; + font-weight: normal; + font-family: "Helvetica Neue Light", HelveticaNeue-Light, Arial, Helvetica, sans-serif; } #header h1:hover { color: #cc0000; } -#header a:visited { - font-style: normal; -} -#nav ul { - padding: 0; - margin: 0; +#nav { + float: right; + width: 10em; + font-size: 1.5em; + line-height: 2em; } #nav ul li { - padding: 0; margin: 0; - display: inline; list-style: none; - padding: 0.5em; - margin-right: 5px; - background: black; - color: white; -} -#nav ul li:hover { - border-bottom: 5px solid #cc0000; + border-bottom: 1px solid #eee; } #nav a { - color: white; border: none; font-style: normal; } -#content-header { - margin: 1em 0 0 0; +#splash-info { + font-size: 1.5em; + line-height: 2em; + text-align: right; + color: #888; + font-family: "Helvetica Neue Light", HelveticaNeue-Light, Arial, Helvetica, sans-serif; +} +#splash-info ul li { + margin: 0; + list-style: none; + border-bottom: 1px solid #eee; } #content { - margin: 0 2em 2em 2em; + width: 42em; } ul#archives { @@ -96,11 +97,6 @@ font-size: 1.5em; } -#footer { - text-align: center; - font-size: 0.6em; -} - div.article { margin-top: 2em; }