28bc60c69bc2

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Thu, 17 Feb 2011 18:16:01 -0500
parents 519599cdee45 (diff) 79e8d711898c (current diff)
children bcfe45b057ff
branches/tags (none)
files

Changes

--- a/layout/_splash.html	Sun Feb 06 19:10:31 2011 -0500
+++ b/layout/_splash.html	Thu Feb 17 18:16:01 2011 -0500
@@ -1,18 +1,27 @@
 {% extends "skeleton/_base.html" %}
 
+{% block title %}{{ site.name }}{% endblock %}
+
 {% block content %}
-    <div class="splash">
+    <div class="splash vcard">
         {% filter typogrify %}
-            <p>Hello, I'm Steve.</p>
+            <p>
+                Hello,
+                I'm
+                <a href="{{ site.full_url }}" class="fn url">Steve<span class="last-name"> Losh</span></a>.
+            </p>
 
             <p>
-                I'm a programmer, photographer, dancer <span class="amp">&amp;</span>
-                bassist from Rochester,&nbsp;New&nbsp;York.
+                I'm a
+                <span class="role">programmer, photographer, dancer &amp; bassist</span>
+                from
+                <span class="adr"><span class="locality">Rochester</span>, <span class="region">New&nbsp;York</span></span>.
             </p>
 
             <p>
                 If you want to get in touch with me,
-                <a href="mailto:steve@stevelosh.com">email</a> is best.
+                <a class="email" href="mailto:steve@stevelosh.com">email</a>
+                is best.
             </p>
         {% endfilter %}
     </div>
--- a/layout/skeleton/_base.html	Sun Feb 06 19:10:31 2011 -0500
+++ b/layout/skeleton/_base.html	Thu Feb 17 18:16:01 2011 -0500
@@ -1,12 +1,10 @@
 {% extends "skeleton/_root.html" %}
-
 {% block all %}
 <!DOCTYPE html>
-
 <html>
     <head>
-        <link href='http://fonts.googleapis.com/css?family=OFL+Sorts+Mill+Goudy+TT:regular,italic' rel='stylesheet' type='text/css'>
-
+        <link href='http://fonts.googleapis.com/css?family=OFL+Sorts+Mill+Goudy+TT:regular,italic' rel='stylesheet' type='text/css' />
+        <link rel="profile" href="http://microformats.org/profile/hcard" />
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
         <title>{% block title %}{% block extra_title %}{% endblock %}{{ page.title|safe }} / {{ site.name }}{% endblock %}</title>
--- a/media/css/sjl.less	Sun Feb 06 19:10:31 2011 -0500
+++ b/media/css/sjl.less	Thu Feb 17 18:16:01 2011 -0500
@@ -103,7 +103,7 @@
                 text-transform: lowercase;
                 padding-left: 2px;
                 width: 612px - 2px - 400px;
-                
+
                 .amp {
                     font-style: italic;
                 }
@@ -149,7 +149,8 @@
     }
 }
 .splash {
-    color: #454545;
+    @color: #454545;
+    color: @color;
     text-align: center;
     font: normal 27px/32px @font-fancy;
     margin-bottom: -1px;
@@ -161,6 +162,18 @@
     .amp {
         font-style: italic;
     }
+    .fn {
+        color: @color;
+        text-decoration: none;
+
+        &:hover {
+            color: @c-link;
+            text-decoration: none;
+        }
+        .last-name {
+            display: none;
+        }
+    }
 }
 .section-listing {
     margin-bottom: -50px;
@@ -310,3 +323,4 @@
     float: right;
     padding-top: 1px;
 }
+