FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-25 21:11:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'gh-pages' of https://github.com/FortAwesome/Font-Awesome into gh-pages

Browse Source
This commit is contained in:
Dave Gandy 2012-06-14 17:08:33 -04:00
commit 3aa4f2be5c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/font-awesome.css vendored
View File

@ -22,7 +22,7 @@
*/
@font-face {
font-family: 'FontAwesome';
font-family: "FontAwesome";
src: url('../font/fontawesome-webfont.eot');
src: url('../font/fontawesome-webfont.eot?#iefix') format('eot'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
font-weight: normal;

12
assets/less/font-awesome.less vendored
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;
}