Merge c4f7bae291c9ea72cc15f0d3511fd09b8e08dc0c into 449167359b984c4caff392e33b1824b0d373c2e1

This commit is contained in:
GitHub Merge Button 2012-06-06 14:10:04 -07:00
commit d9a5cd6517

View File

@ -22,13 +22,15 @@
*/
@fontAwesomePath: '../font';
@font-face {
font-family: 'FontAwesome';
src: url('../font/fontawesome-webfont.eot');
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
url('../font/fontawesome-webfont.woff') format('woff'),
url('../font/fontawesome-webfont.ttf') format('truetype'),
url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
src: url('@{fontAwesomePath}/fontawesome-webfont.eot');
src: url('@{fontAwesomePath}/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
url('@{fontAwesomePath}/fontawesome-webfont.woff') format('woff'),
url('@{fontAwesomePath}/fontawesome-webfont.ttf') format('truetype'),
url('@{fontAwesomePath}/fontawesome-webfont.svg#FontAwesome') format('svg');
font-weight: normal;
font-style: normal;
}