Miko/webicons
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged conflict

Browse Source
This commit is contained in:
Adam Fairhead
2013-01-18 17:10:36 -05:00
parent b503faf17c
commit c346a841f9
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fc-webicons.css
View File

@@ -41,19 +41,17 @@
.no-svg .fc-webicon.bitbucket.small { background: url("images/fc-webicon-bitbucket-s.png"); }
.svg .fc-webicon.bitbucket { background: url("images/fc-webicon-bitbucket.svg"); }
<<<<<<< HEAD
/* Blogger */
.no-svg .fc-webicon.blogger { background: url("images/fc-webicon-blogger-m.png"); }
.no-svg .fc-webicon.blogger.large { background: url("images/fc-webicon-blogger"); }
.no-svg .fc-webicon.blogger.small { background: url("images/fc-webicon-blogger-s.png"); }
.svg .fc-webicon.blogger { background: url("images/fc-webicon-blogger"); }
=======
/* Coderwall */
.no-svg .fc-webicon.coderwall { background: url("images/fc-webicon-coderwall-m.png"); }
.no-svg .fc-webicon.coderwall.large { background: url("images/fc-webicon-coderwall.png"); }
.no-svg .fc-webicon.coderwall.small { background: url("images/fc-webicon-coderwall-s.png"); }
.svg .fc-webicon.coderwall { background: url("images/fc-webicon-coderwall.svg"); }
>>>>>>> 32ec582b12ab4257c789d27c551abd24372ac4f9
/* Creative Cloud */
.no-svg .fc-webicon.creativecloud { background: url("images/fc-webicon-creativecloud-m.png"); }

4
fc-webicons.html
View File

@@ -34,11 +34,11 @@
<a class="fc-webicon behance small" href="#">Behance</a>
<a class="fc-webicon bitbucket small" href="#">Bitbucket</a>
<a class="fc-webicon coderwall small" href="#">Coderwall</a>
<a class="fc-webicon blogger small" href="#">Blogger</a>
<a class="fc-webicon coderwall small" href="#">Coderwall</a>
<a class="fc-webicon creativecloud small" href="#">Creative Cloud</a>
<a class="fc-webicon dribbble small" href="#">Dribbble</a>