Skip to content

Commit f634fa9

Browse files
committed
Merge branch 'gh-pages' of github.com:lipis/bootstrap-social into gh-pages
* 'gh-pages' of github.com:lipis/bootstrap-social: Update FontAwesome to 4.3.0
2 parents b53226d + 6fa9ddf commit f634fa9

8 files changed

+187
-13
lines changed

assets/css/font-awesome.css

+133-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*!
2-
* Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
2+
* Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
33
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
44
*/
55
/* FONT PATH
66
* -------------------------- */
77
@font-face {
88
font-family: 'FontAwesome';
9-
src: url('../fonts/fontawesome-webfont.eot?v=4.2.0');
10-
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
9+
src: url('../fonts/fontawesome-webfont.eot?v=4.3.0');
10+
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.3.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.3.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.3.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular') format('svg');
1111
font-weight: normal;
1212
font-style: normal;
1313
}
@@ -18,6 +18,7 @@
1818
text-rendering: auto;
1919
-webkit-font-smoothing: antialiased;
2020
-moz-osx-font-smoothing: grayscale;
21+
transform: translate(0, 0);
2122
}
2223
/* makes the font 33% larger relative to the icon container */
2324
.fa-lg {
@@ -80,6 +81,10 @@
8081
-webkit-animation: fa-spin 2s infinite linear;
8182
animation: fa-spin 2s infinite linear;
8283
}
84+
.fa-pulse {
85+
-webkit-animation: fa-spin 1s infinite steps(8);
86+
animation: fa-spin 1s infinite steps(8);
87+
}
8388
@-webkit-keyframes fa-spin {
8489
0% {
8590
-webkit-transform: rotate(0deg);
@@ -610,6 +615,7 @@
610615
.fa-twitter:before {
611616
content: "\f099";
612617
}
618+
.fa-facebook-f:before,
613619
.fa-facebook:before {
614620
content: "\f09a";
615621
}
@@ -1259,7 +1265,8 @@
12591265
.fa-male:before {
12601266
content: "\f183";
12611267
}
1262-
.fa-gittip:before {
1268+
.fa-gittip:before,
1269+
.fa-gratipay:before {
12631270
content: "\f184";
12641271
}
12651272
.fa-sun-o:before {
@@ -1526,6 +1533,7 @@
15261533
.fa-history:before {
15271534
content: "\f1da";
15281535
}
1536+
.fa-genderless:before,
15291537
.fa-circle-thin:before {
15301538
content: "\f1db";
15311539
}
@@ -1670,3 +1678,124 @@
16701678
.fa-meanpath:before {
16711679
content: "\f20c";
16721680
}
1681+
.fa-buysellads:before {
1682+
content: "\f20d";
1683+
}
1684+
.fa-connectdevelop:before {
1685+
content: "\f20e";
1686+
}
1687+
.fa-dashcube:before {
1688+
content: "\f210";
1689+
}
1690+
.fa-forumbee:before {
1691+
content: "\f211";
1692+
}
1693+
.fa-leanpub:before {
1694+
content: "\f212";
1695+
}
1696+
.fa-sellsy:before {
1697+
content: "\f213";
1698+
}
1699+
.fa-shirtsinbulk:before {
1700+
content: "\f214";
1701+
}
1702+
.fa-simplybuilt:before {
1703+
content: "\f215";
1704+
}
1705+
.fa-skyatlas:before {
1706+
content: "\f216";
1707+
}
1708+
.fa-cart-plus:before {
1709+
content: "\f217";
1710+
}
1711+
.fa-cart-arrow-down:before {
1712+
content: "\f218";
1713+
}
1714+
.fa-diamond:before {
1715+
content: "\f219";
1716+
}
1717+
.fa-ship:before {
1718+
content: "\f21a";
1719+
}
1720+
.fa-user-secret:before {
1721+
content: "\f21b";
1722+
}
1723+
.fa-motorcycle:before {
1724+
content: "\f21c";
1725+
}
1726+
.fa-street-view:before {
1727+
content: "\f21d";
1728+
}
1729+
.fa-heartbeat:before {
1730+
content: "\f21e";
1731+
}
1732+
.fa-venus:before {
1733+
content: "\f221";
1734+
}
1735+
.fa-mars:before {
1736+
content: "\f222";
1737+
}
1738+
.fa-mercury:before {
1739+
content: "\f223";
1740+
}
1741+
.fa-transgender:before {
1742+
content: "\f224";
1743+
}
1744+
.fa-transgender-alt:before {
1745+
content: "\f225";
1746+
}
1747+
.fa-venus-double:before {
1748+
content: "\f226";
1749+
}
1750+
.fa-mars-double:before {
1751+
content: "\f227";
1752+
}
1753+
.fa-venus-mars:before {
1754+
content: "\f228";
1755+
}
1756+
.fa-mars-stroke:before {
1757+
content: "\f229";
1758+
}
1759+
.fa-mars-stroke-v:before {
1760+
content: "\f22a";
1761+
}
1762+
.fa-mars-stroke-h:before {
1763+
content: "\f22b";
1764+
}
1765+
.fa-neuter:before {
1766+
content: "\f22c";
1767+
}
1768+
.fa-facebook-official:before {
1769+
content: "\f230";
1770+
}
1771+
.fa-pinterest-p:before {
1772+
content: "\f231";
1773+
}
1774+
.fa-whatsapp:before {
1775+
content: "\f232";
1776+
}
1777+
.fa-server:before {
1778+
content: "\f233";
1779+
}
1780+
.fa-user-plus:before {
1781+
content: "\f234";
1782+
}
1783+
.fa-user-times:before {
1784+
content: "\f235";
1785+
}
1786+
.fa-hotel:before,
1787+
.fa-bed:before {
1788+
content: "\f236";
1789+
}
1790+
.fa-viacoin:before {
1791+
content: "\f237";
1792+
}
1793+
.fa-train:before {
1794+
content: "\f238";
1795+
}
1796+
.fa-subway:before {
1797+
content: "\f239";
1798+
}
1799+
.fa-medium:before {
1800+
content: "\f23a";
1801+
}

assets/fonts/FontAwesome.otf

91.7 KB
Binary file not shown.

assets/fonts/fontawesome-webfont.eot

4.65 KB
Binary file not shown.

assets/fonts/fontawesome-webfont.svg

+53-8
Loading

assets/fonts/fontawesome-webfont.ttf

9.7 KB
Binary file not shown.

assets/fonts/fontawesome-webfont.woff

5.91 KB
Binary file not shown.
55.4 KB
Binary file not shown.

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
],
1010
"dependencies": {
1111
"bootstrap": "~3",
12-
"font-awesome": "~4.2"
12+
"font-awesome": "~4.3"
1313
}
1414
}

0 commit comments

Comments
 (0)