Merge branch 'NumEricR/hCard' into hCard

Conflicts:
	css/resume.css
	views/resume.html
This commit is contained in:
NumEricR 2011-07-29 22:16:10 +02:00
commit 6d86f53a0a
2 changed files with 19 additions and 19 deletions

View File

@ -40,11 +40,11 @@ a { color: #990003; }
a:hover { text-decoration: none; }
strong { font-weight: bold; }
li { line-height: 24px; border-bottom: 1px solid #ccc; }
.enlarge { font-size: 144%; padding-right: 6.5em; line-height: 24px; }
.enlarge span { color: #000; }
.contact-info { margin-top: 7px; text-align: right; font-size: 12px; position: relative; float: left; width: 100%; }
.contact-info a { position: relative; float: left; width: 100%; }
.contact-info img { float: right; border: 1px solid #ccc; width: 150px; height: 150px; margin: -24px 0 14px; }
p.enlarge { font-size: 144%; padding-right: 6.5em; line-height: 24px; }
p.enlarge span { color: #000 }
.contact-info { margin-top: 7px; text-align: right; font-size: 12px; position: relative; float: left; width: 100%;}
.contact-info a { position :relative; float: left; width: 100%;}
.contact-info img {float: right; border: 1px solid #ccc; width: 150px; height: 150px; margin: -24px 0 14px;}
.first h2 { font-style: italic; }
.last { border-bottom: 0; }
@ -80,7 +80,7 @@ li { line-height: 24px; border-bottom: 1px solid #ccc; }
-moz-border-radius: 4px;
border-radius: 4px;
font-family: Georgia, Garamond, "Times New Roman", Times, serif;
color: #444;
color: #444;
font-size: 18px;
padding: 5px;
}
@ -92,7 +92,7 @@ li { line-height: 24px; border-bottom: 1px solid #ccc; }
width: 20%;
height: 44px;
font-family: Georgia, Garamond, "Times New Roman", Times, serif;
font-size: 18px;
font-size: 18px;
color: #fff;
background-image: -webkit-gradient(
linear,
@ -130,8 +130,8 @@ li { line-height: 24px; border-bottom: 1px solid #ccc; }
}
noscript {
display: block;
margin-top: 30px;
font-size: 152%;
color: #990003;
}
display: block;
margin-top: 30px;
font-size: 152%;
color: #990003;
}

View File

@ -1,11 +1,11 @@
<div id="doc2" class="yui-t7">
<div id="inner">
<div id="inner" class="vcard">
<div id="hd">
<div class="yui-gc">
<div class="yui-u first">
<hgroup>
<h1>{{name}}</h1>
<h1 class="fn">{{name}}</h1>
<h2>Passionate github user</h2>
</hgroup>
</div>
@ -13,9 +13,9 @@
<div class="yui-u">
<div class="contact-info">
{{#gravatar_id}}
<img src="https://secure.gravatar.com/avatar/{{gravatar_id}}?s=140&amp;d=https://github.com/images/gravatars/gravatar-140.png" alt=""/>
<img src="https://secure.gravatar.com/avatar/{{gravatar_id}}?s=140&amp;d=https://github.com/images/gravatars/gravatar-140.png" alt="" class="photo" />
{{/gravatar_id}}
{{#email}}<h3><a href="mailto:{{email}}">{{email}}</a></h3>{{/email}}
{{#email}}<h3><a href="mailto:{{email}}" class="email">{{email}}</a></h3>{{/email}}
</div><!--// .contact-info -->
</div>
</div><!--// .yui-gc -->
@ -33,10 +33,10 @@
<p class="enlarge">
I'm a developer
{{#location}}
based in {{location}}
based in <span class="adr locality">{{location}}</span>
{{/location}}
with <a href="https://github.com/{{{username}}}">{{repos}} public {{reposLabel}}</a>{{#followers}}&nbsp;and {{followers}} {{followersLabel}}{{/followers}}.
I've been using github.com since {{since}}{{#blog}}&nbsp;and sometimes I blog at <a href="{{blog}}" id="myblog" title="my blog">{{blog}}</a>{{/blog}}.
I've been using github.com since {{since}}{{#blog}}&nbsp;and sometimes I blog at <a href="{{blog}}" id="myblog" class="url" title="my blog">{{blog}}</a>{{/blog}}.
</p>
<p id="languages" class="enlarge"></p>
</div>
@ -87,7 +87,7 @@
</div><!--// bd -->
<div id="ft">
<p>{{name}} &mdash; {{#email}}<a href="mailto:{{email}}">{{email}}</a> &mdash; {{/email}} <a href="https://github.com/{{username}}" title="Github profile">https://github.com/{{username}}</a></p>
<p>{{name}} &mdash; {{#email}}<a href="mailto:{{email}}">{{email}}</a> &mdash; {{/email}} <a href="https://github.com/{{username}}" title="Github profile" class="url">https://github.com/{{username}}</a></p>
</div><!--// footer -->
</div><!-- // inner -->