Permalink
Browse files

Fix merge

  • Loading branch information...
swanson committed Jul 31, 2014
2 parents 390fa86 + 0c6cda8 commit c222c6735e04bad0f854e16a17e43bafd6e841df
View
@@ -1,2 +1,4 @@
_site/
.DS_Store
.DS_Store
.*.swp
.idea
View
@@ -2,4 +2,4 @@
highlighter: pygments
url: http://example.com
lsi: false
exclude: [LICENSE, CNAME, README.md, .gitignore, Gemfile, Gemfile.lock]
exclude: [LICENSE, CNAME, README.md, .gitignore, Gemfile, Gemfile.lock]
View
@@ -6,8 +6,15 @@ highlight_color: '#3498db'
# Profile links on the left sidebar, leave blank to ignore
social:
github: swanson
twitter: _swanson
#bitbucket: philipj
hacker_news: swanson
#stackexchange: 348619
#stackoverflow: 348619
twitter: _swanson
#facebook: zuck
#tumblr: animalygifs
#linkedin: philipjagielski
#gplus: 110552447039675960964
# "Hi, I'm _______"
name: Matt Swanson

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -209,13 +209,12 @@ nav hr {
color: {{ site.data.theme.highlight_color }};
}
span.icon-hn {
i.fa-hn {
font-family: "open sans", sans-serif;
line-height: 20px;
text-align: center;
font-weight: bold;
font-size: 18px !important;
position: relative;
left: 7px;
color: white;
}
.home {
@@ -234,7 +233,7 @@ span.icon-hn {
text-align: center;
}
.footnotes {
.footnotes {
font-size: 14px;
font-style: italic;
}
@@ -248,8 +247,8 @@ span.icon-hn {
}
.caption {
margin: 0 auto;
text-align: center;
font-size: smaller;
margin: 0 auto;
text-align: center;
font-size: smaller;
padding-bottom: 10px
}
View
@@ -1,25 +1,69 @@
Follow me:
<div id="stalker">
{% if site.data.theme.social.github %}
<a title="{{ site.data.theme.social.github }} on Github" href="http://github.com/{{ site.data.theme.social.github }}">
<i class="icon-github-sign"></i>
<a title="{{ site.data.theme.social.github }} on Github" href="https://github.com/{{ site.data.theme.social.github }}">
<i class="fa fa-github-square"></i>
</a>
{% endif %}
{% if site.data.theme.social.bitbucket %}
<a title="{{ site.data.theme.social.bitbucket }} on Bitbucket" href="https://bitbucket.com/{{ site.data.theme.social.bitbucket }}/">
<i class="fa fa-bitbucket-square"></i>
</a>
{% endif %}
{% if site.data.theme.social.hacker_news %}
<a title="{{ site.data.theme.social.hacker_news }} on Hacker News" href="http://news.ycombinator.com/user?id={{site.data.theme.social.hacker_news }}">
<i class="icon-sign-blank"></i>
<span class="icon-overlay icon-hn">Y</span>
<a title="{{ site.data.theme.social.hacker_news }} on Hacker News" href="https://news.ycombinator.com/user?id={{site.data.theme.social.hacker_news }}">
<span class="fa-stack">
<i class="fa fa-stack-1x fa-square"></i>
<i class="fa fa-stack-1x fa-hn">Y</i>
</span>
</a>
{% endif %}
{% if site.data.theme.social.stackexchange %}
<a title="{{ site.data.theme.name }} on Stack Exchange" href="https://stackexchange.com/users/{{site.data.theme.social.stackexchange }}">
<i class="fa fa-stack-exchange"></i>
</a>
{% endif %}
{% if site.data.theme.social.stackoverflow %}
<a title="{{ site.data.theme.name }} on Stack Overflow" href="http://stackoverflow.com/users/{{site.data.theme.social.stackoverflow }}">
<i class="fa fa-stack-overflow"></i>
</a>
{% endif %}
{% if site.data.theme.social.twitter %}
<a title="{{ site.data.theme.social.twitter }} on Twitter" href="http://twitter.com/{{ site.data.theme.social.twitter }}">
<i class="icon-twitter-sign"></i>
<a title="{{ site.data.theme.social.twitter }} on Twitter" href="https://twitter.com/{{ site.data.theme.social.twitter }}">
<i class="fa fa-twitter-square"></i>
</a>
{% endif %}
{% if site.data.theme.social.facebook %}
<a title="{{ site.data.theme.name }} on Facebook" href="https://facebook.com/{{ site.data.theme.social.facebook }}">
<i class="fa fa-facebook-square"></i>
</a>
{% endif %}
{% if site.data.theme.social.tumblr %}
<a title="{{ site.data.theme.name }} on tumblr" href="https://{{ site.data.theme.social.tumblr }}.tumblr.com">
<i class="fa fa-tumblr-square"></i>
</a>
{% endif %}
{% if site.data.theme.social.linkedin %}
<a title="{{ site.data.theme.name }} on LinkedIn" href="https://www.linkedin.com/in/{{ site.data.theme.social.linkedin }}">
<i class="fa fa-linkedin-square"></i>
</a>
{% endif %}
{% if site.data.theme.social.gplus %}
<a title="{{ site.data.theme.name }} on Google Plus" href="https://plus.google.com/{{ site.data.theme.social.gplus }}">
<i class="fa fa-google-plus-square"></i>
</a>
{% endif %}
<a title="RSS feed" id="rss" href="/atom.xml">
<i class="icon-rss-sign"></i>
<i class="fa fa-rss-square"></i>
</a>
</div>
</div>
View
@@ -16,9 +16,7 @@
<link rel="alternate" type="application/rss+xml" title="{{ site.data.theme.name }}" href="{{site.url}}/atom.xml" />
<link rel="stylesheet" href="/assets/css/all.css">
<!--[if IE 7]>
<link rel="stylesheet" href="/assets/css/font-awesome-ie7.min.css">
<![endif]-->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.min.css">
</head>
<body>
<div class="container">
@@ -28,7 +26,7 @@
<div class="eleven columns content">
{{ content }}
<div class="footer">
{% include footer.html %}
</div>
@@ -37,4 +35,4 @@
{% include analytics.html %}
</body>
</html>
</html>
View
@@ -5,7 +5,7 @@
<p class="meta">
{{ page.date | date: "%B %d, %Y" }}
<a href="/">
<i class="home icon-home"></i>
<i class="home fa fa-home"></i>
</a>
</p>
@@ -24,4 +24,4 @@ <h3>Related Posts</h3>
</li>
{% endfor %}
</ul>
</div>
</div>
View
@@ -1,8 +1,7 @@
---
---
{% include css/font-awesome.css %}
{% include css/base.css %}
{% include css/skeleton.css %}
{% include css/screen.css %}
{% include css/layout.css %}
{% include css/syntax.css %}
{% include css/syntax.css %}

Large diffs are not rendered by default.

Oops, something went wrong.
View
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit c222c67

Please sign in to comment.