Merge branch 'github-social-icon' into improved-icons

Conflicts:
	docs/changelog.rst
This commit is contained in:
David Beitey 2012-11-04 12:09:28 +10:00
commit 41d3a1e8dd
3 changed files with 4 additions and 1 deletions

View file

@ -309,7 +309,9 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
.social a[href*='github.com'],
.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
/*
About

Binary file not shown.

After

Width:  |  Height:  |  Size: 360 B