Merge b8d47b3d85a3725bc9567dc0f279026c58a55264 into 563a6f3cba56ac802af9d898c5b9a3401e6faabf

This commit is contained in:
GitHub Merge Button 2012-04-30 14:34:51 -07:00
commit fff23e31c3

View File

@ -24,12 +24,12 @@
@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.svgz#FontAwesomeRegular') format('svg'),
url('../font/fontawesome-webfont.svg#FontAwesomeRegular') 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.svgz#FontAwesomeRegular') format('svg'),
url('@{fontAwesomePath}fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
font-weight: normal;
font-style: normal;
}