# HG changeset patch # User Steve Losh # Date 1261767502 18000 # Node ID 1f5a661bd38b410eb7a44dd2036adb56da4c1bd9 # Parent ff79b07cc506b1f811549ca0d7696127d40f5a01 Lots of style adjustments. diff -r ff79b07cc506 -r 1f5a661bd38b layout/_flatpage.html --- a/layout/_flatpage.html Wed Dec 23 21:16:35 2009 -0500 +++ b/layout/_flatpage.html Fri Dec 25 13:58:22 2009 -0500 @@ -1,7 +1,7 @@ {% extends "skeleton/_base.html" %} {% block content %} -

{{ page.title }}

+

{{ page.title|safe|typogrify }}

{% filter typogrify %} diff -r ff79b07cc506 -r 1f5a661bd38b layout/_post.html --- a/layout/_post.html Wed Dec 23 21:16:35 2009 -0500 +++ b/layout/_post.html Fri Dec 25 13:58:22 2009 -0500 @@ -1,14 +1,16 @@ {% extends "skeleton/_base.html" %} {% block content %} -

{{ page.title|safe }}

+

{{ page.title|safe|typogrify }}

{% filter typogrify %} {% article %} - {% markdown %} - {% block article %}{% endblock %} - {% endmarkdown %} + {% filter typogrify %} + {% markdown %} + {% block article %}{% endblock %} + {% endmarkdown %} + {% endfilter %} {% endarticle %} {% endfilter %}
diff -r ff79b07cc506 -r 1f5a661bd38b layout/skeleton/_base.html --- a/layout/skeleton/_base.html Wed Dec 23 21:16:35 2009 -0500 +++ b/layout/skeleton/_base.html Fri Dec 25 13:58:22 2009 -0500 @@ -8,7 +8,7 @@ - {% block title %}{{ page.title }} / {{ site.name }}{% endblock %} + {% block title %}{{ page.title|safe }} / {{ site.name }}{% endblock %} {% block feeds %} diff -r ff79b07cc506 -r 1f5a661bd38b layout/skeleton/_innerlisting.html --- a/layout/skeleton/_innerlisting.html Wed Dec 23 21:16:35 2009 -0500 +++ b/layout/skeleton/_innerlisting.html Fri Dec 25 13:58:22 2009 -0500 @@ -9,10 +9,10 @@
  • {% with list_page.name_without_extension|remove_date_prefix|unslugify as default_title %} - {{ list_page.title|default_if_none:default_title|safe }} + {{ list_page.title|default_if_none:default_title|safe|typogrify }} {%endwith%} - {{ list_page.snip|safe }} + {{ list_page.snip|safe|typogrify }}
    • {%endif%} {% endifnotequal %} diff -r ff79b07cc506 -r 1f5a661bd38b media/css/base.css --- a/media/css/base.css Wed Dec 23 21:16:35 2009 -0500 +++ b/media/css/base.css Fri Dec 25 13:58:22 2009 -0500 @@ -1,19 +1,19 @@ /* @override http://localhost:8080/media/css/base.css */ -* { - margin: 0; - padding: 0; -} - +/* Main layout styles. */ body { font-family: "Helvetica Neue", HelveticaNeue, Arial, Helvetica, sans-serif; color: #111; } - div#main-wrap { - width: 64em; + width: 62em; margin: 0 auto; } +div#content { + width: 48em; + margin-bottom: 5em; +} +/* Link styles. */ a { text-decoration: none; color: #e50053; @@ -29,12 +29,15 @@ text-decoration: none; } +/* Page header styles. */ #header { margin-top: 1.5em; margin-bottom: 3em; + overflow: visible; + white-space: nowrap; } #header h1 { - letter-spacing: -3px; + letter-spacing: -3px; font-size: 3.5em; font-weight: normal; font-family: "Helvetica Neue", HelveticaNeue, Arial, Helvetica, sans-serif; @@ -45,6 +48,7 @@ text-transform: lowercase; } +/* Navigation bar styles. */ #nav { float: right; width: 10em; @@ -69,6 +73,7 @@ text-decoration: none; } +/* Splash page styles. */ #splash-info { font-size: 1.5em; line-height: 2em; @@ -85,11 +90,7 @@ border-bottom: none; } -#content { - width: 46em; - margin-bottom: 5em; -} - +/* Section listing styles. */ div#section-listing { font-size: 1.5em; font-weight: bold; @@ -120,6 +121,7 @@ font-weight: normal; } +/* Code styles. */ code, pre { font-family: Consolas, Monaco, "Courier New", monospace; font-size: 12px; @@ -136,4 +138,40 @@ padding: 0px 5px; margin-left: 2em; overflow: auto; +} + +/* Quoting styles. */ +blockquote { + border: 1px solid #ccc; + background-color: #fafafa; + padding: 0px 5px; + margin-left: 2em; + overflow: auto; +} +blockquote p:last-child { + margin-bottom: 0; +} + +/* Ampersand styles. */ +span.amp { + font-family: "Palatino", "Constantia", "Palatino Linotype", serif; + font-style: italic; +} +div#section-listing ol li a span.amp { + font-weight: bold; + line-height: 0.85em; + font-size: 1.25em; + color: inherit; +} +h1 span.amp, h2 span.amp, h3 span.amp, h4 span.amp, h5 span.amp, h6 span.amp { + font-weight: bold; + line-height: 0.5em; + font-size: 1.25em; + color: inherit; + +} +span.page-title span.amp { + font-weight: normal; + font-size: 1.1em; + line-height: 0.5em; } \ No newline at end of file diff -r ff79b07cc506 -r 1f5a661bd38b settings.py --- a/settings.py Wed Dec 23 21:16:35 2009 -0500 +++ b/settings.py Fri Dec 25 13:58:22 2009 -0500 @@ -13,6 +13,7 @@ BACKUPS_DIR = os.path.join(ROOT_PATH, 'backups') BACKUP = False +DEBUG = True SITE_ROOT = "/" SITE_WWW_URL = "http://stevelosh.com"