FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2025-04-06 00:29:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge d397349bf76b380670dd0f32462b68e585be9faa into 35fca0306805b27e34e73493d6dbd94b461e6a7a

Browse Source
This commit is contained in:
GitHub Merge Button 2012-06-05 11:38:17 -07:00
commit 2bd5ac3b6b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/font-awesome.css vendored
View File

@ -23,8 +23,8 @@
*/
@font-face {
font-family: "FontAwesome";
src: url('/stylesheets/fonts/../font/fontawesome-webfont.eot');
src: url('/stylesheets/fonts/../font/fontawesome-webfont.eot?#iefix') format('eot'), url('/stylesheets/fonts/../font/fontawesome-webfont.woff') format('woff'), url('/stylesheets/fonts/../font/fontawesome-webfont.ttf') format('truetype'), url('/stylesheets/fonts/../font/fontawesome-webfont.otf') format('opentype'), url('/stylesheets/fonts/../font/fontawesome-webfont.svg#FontAwesome') format('svg');
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.otf') format('opentype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
font-weight: normal;
font-style: normal; }

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

@ -24,7 +24,7 @@
@font-face {
font-family: 'FontAwesome';
src: url('../font/fontawesome-webfont.eot');
src: url('/stylesheets/fonts/../font/fontawesome-webfont.eot?#iefix') format('eot'), url('/stylesheets/fonts/../font/fontawesome-webfont.woff') format('woff'), url('/stylesheets/fonts/../font/fontawesome-webfont.ttf') format('truetype'), url('/stylesheets/fonts/../font/fontawesome-webfont.otf') format('opentype'), url('/stylesheets/fonts/../font/fontawesome-webfont.svg#FontAwesome') format('svg');
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.otf') format('opentype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
font-weight: normal;
font-style: normal;
}