FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2025-01-26 23:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed font-face bug on Opera

Browse Source
This commit is contained in:
Taty Grassini 2012-11-28 16:47:54 +01:00
parent ee55c859d2
commit 7bef335b6e
13 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/font-awesome-ie7.css
View File

@ -1,6 +1,6 @@
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
} }

4
css/font-awesome.css vendored
View File

@ -22,7 +22,7 @@
*/ */
@font-face { @font-face {
font-family: "FontAwesome"; font-family: "FontAwesome-webfont";
src: url('../font/fontawesome-webfont.eot'); 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'); 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; font-weight: normal;
@ -32,7 +32,7 @@
/* Font Awesome styles /* Font Awesome styles
------------------------------------------------------- */ ------------------------------------------------------- */
[class^="icon-"]:before, [class*=" icon-"]:before { [class^="icon-"]:before, [class*=" icon-"]:before {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block; display: inline-block;

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

@ -1,4 +1,4 @@
[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-style:normal;font-weight:normal;} [class^="icon-"],[class*=" icon-"]{font-family:FontAwesome-webfont;font-style:normal;font-weight:normal;}
.btn.dropdown-toggle [class^="icon-"],.btn.dropdown-toggle [class*=" icon-"]{line-height:1.4em;} .btn.dropdown-toggle [class^="icon-"],.btn.dropdown-toggle [class*=" icon-"]{line-height:1.4em;}
.icon-large{font-size:1.3333em;} .icon-large{font-size:1.3333em;}
.icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' ');} .icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' ');}

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

@ -22,7 +22,7 @@
*/ */
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome-webfont';
src: url('../font/fontawesome-webfont.eot'); 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'); 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; font-weight: normal;
@ -32,7 +32,7 @@
/* Font Awesome styles /* Font Awesome styles
------------------------------------------------------- */ ------------------------------------------------------- */
[class^="icon-"]:before, [class*=" icon-"]:before { [class^="icon-"]:before, [class*=" icon-"]:before {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block; display: inline-block;

6
docs/assets/css/site.css
View File

@ -3780,7 +3780,7 @@ a.badge:hover {
*/ */
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome-webfont';
src: url('../font/fontawesome-webfont.eot'); 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('../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');
font-weight: normal; font-weight: normal;
@ -3790,7 +3790,7 @@ a.badge:hover {
------------------------------------------------------- */ ------------------------------------------------------- */
[class^="icon-"]:before, [class^="icon-"]:before,
[class*=" icon-"]:before { [class*=" icon-"]:before {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block; display: inline-block;
@ -4780,7 +4780,7 @@ h6 {
} }
#examples .rating span.star, #examples .rating span.star,
#code .rating span.star { #code .rating span.star {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block; display: inline-block;

2
docs/assets/less/font-awesome-ie7.less
View File

@ -1,6 +1,6 @@
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
} }

4
docs/assets/less/font-awesome.less vendored
View File

@ -23,7 +23,7 @@
*/ */
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome-webfont';
src: url('../font/fontawesome-webfont.eot'); src: url('../font/fontawesome-webfont.eot');
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.woff') format('woff'),
@ -37,7 +37,7 @@
------------------------------------------------------- */ ------------------------------------------------------- */
[class^="icon-"]:before, [class^="icon-"]:before,
[class*=" icon-"]:before { [class*=" icon-"]:before {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block; display: inline-block;

4
docs/assets/less/site.less
View File

@ -48,7 +48,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
//a[href^='http://'] { //a[href^='http://'] {
// &:after { // &:after {
// font-family: FontAwesome; // font-family: FontAwesome-webfont;
// content: "\0020 \f08e"; // content: "\0020 \f08e";
// &:hover { // &:hover {
// text-decoration: none; // text-decoration: none;
@ -219,7 +219,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
font-size: 30px; font-size: 30px;
span.star { span.star {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block; display: inline-block;

2
docs/index.html
View File

@ -688,7 +688,7 @@
Open your project's font-awesome.less and edit the font url to ensure it points to the right place. Open your project's font-awesome.less and edit the font url to ensure it points to the right place.
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome-webfont';
src: url('../font/fontawesome-webfont.eot'); src: url('../font/fontawesome-webfont.eot');
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.woff') format('woff'),

2
less/font-awesome-ie7.less
View File

@ -1,6 +1,6 @@
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
} }

4
less/font-awesome.less vendored
View File

@ -25,7 +25,7 @@
@fontAwesomePath: '../font'; @fontAwesomePath: '../font';
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome-webfont';
src: url('@{fontAwesomePath}/fontawesome-webfont.eot'); src: url('@{fontAwesomePath}/fontawesome-webfont.eot');
src: url('@{fontAwesomePath}/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), src: url('@{fontAwesomePath}/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
url('@{fontAwesomePath}/fontawesome-webfont.woff') format('woff'), url('@{fontAwesomePath}/fontawesome-webfont.woff') format('woff'),
@ -39,7 +39,7 @@
------------------------------------------------------- */ ------------------------------------------------------- */
[class^="icon-"]:before, [class^="icon-"]:before,
[class*=" icon-"]:before { [class*=" icon-"]:before {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block; display: inline-block;

4
sass/font-awesome.sass
View File

@ -24,14 +24,14 @@
$fontAwesomePath: "../font/fontawesome-webfont" !default $fontAwesomePath: "../font/fontawesome-webfont" !default
+font-face("FontAwesome", font-files("#{$fontAwesomePath}.woff", woff, "#{$fontAwesomePath}.ttf", truetype, "#{$fontAwesomePath}.svg#FontAwesomeRegular", svg), "#{$fontAwesomePath}.eot", normal, normal) +font-face("FontAwesome-webfont", font-files("#{$fontAwesomePath}.woff", woff, "#{$fontAwesomePath}.ttf", truetype, "#{$fontAwesomePath}.svg#FontAwesomeRegular", svg), "#{$fontAwesomePath}.eot", normal, normal)
/* Font Awesome styles /* Font Awesome styles
* ------------------------------------------------------- * -------------------------------------------------------
[class^="icon-"]:before, [class^="icon-"]:before,
[class*=" icon-"]:before [class*=" icon-"]:before
font-family: FontAwesome font-family: FontAwesome-webfont
font-weight: normal font-weight: normal
font-style: normal font-style: normal
display: inline-block display: inline-block

4
sass/font-awesome.scss vendored
View File

@ -26,7 +26,7 @@
$fontAwesomePath: "../font/fontawesome-webfont" !default; $fontAwesomePath: "../font/fontawesome-webfont" !default;
@include font-face( @include font-face(
'FontAwesome', 'FontAwesome-webfont',
font-files( font-files(
"#{$fontAwesomePath}.woff", woff, "#{$fontAwesomePath}.woff", woff,
"#{$fontAwesomePath}.ttf", truetype, "#{$fontAwesomePath}.ttf", truetype,
@ -39,7 +39,7 @@ $fontAwesomePath: "../font/fontawesome-webfont" !default;
------------------------------------------------------- */ ------------------------------------------------------- */
[class^="icon-"]:before, [class^="icon-"]:before,
[class*=" icon-"]:before { [class*=" icon-"]:before {
font-family: FontAwesome; font-family: FontAwesome-webfont;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block; display: inline-block;