diff --git a/css/font-awesome.css b/css/font-awesome.css index 3e39f3be4..8c69a9be5 100644 --- a/css/font-awesome.css +++ b/css/font-awesome.css @@ -27,7 +27,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../fonts/FontAwesome.otf') format('opentype'); + src: url('../fonts/fontawesome-webfont.eot?v=4.0.0'); + src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index b5827a8a3..d1535df18 100644 --- a/css/font-awesome.min.css +++ b/css/font-awesome.min.css @@ -1,4 +1,4 @@ -@font-face{font-family:'FontAwesome';src:url('../fonts/FontAwesome.otf') format('opentype');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} +@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} .fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%} .fa-2x{font-size:2em} .fa-3x{font-size:3em} diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot index 351785866..e054c93d1 100755 Binary files a/fonts/fontawesome-webfont.eot and b/fonts/fontawesome-webfont.eot differ diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg index 05110cf04..36d43b844 100755 --- a/fonts/fontawesome-webfont.svg +++ b/fonts/fontawesome-webfont.svg @@ -310,7 +310,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -390,10 +390,25 @@ - + - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf index 72e02925b..7ec2e1de8 100755 Binary files a/fonts/fontawesome-webfont.ttf and b/fonts/fontawesome-webfont.ttf differ diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff index b450bfdcd..27d80b123 100755 Binary files a/fonts/fontawesome-webfont.woff and b/fonts/fontawesome-webfont.woff differ diff --git a/less/path.less b/less/path.less index 5b0b476cf..c5a691246 100644 --- a/less/path.less +++ b/less/path.less @@ -3,12 +3,12 @@ @font-face { font-family: 'FontAwesome'; -// src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); -// src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), -// url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), -// url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), -// url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); - src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); + src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), + url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), + url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), + url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); +// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.eot b/src/assets/font-awesome/fonts/fontawesome-webfont.eot index 351785866..e054c93d1 100755 Binary files a/src/assets/font-awesome/fonts/fontawesome-webfont.eot and b/src/assets/font-awesome/fonts/fontawesome-webfont.eot differ diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.svg b/src/assets/font-awesome/fonts/fontawesome-webfont.svg index 05110cf04..36d43b844 100755 --- a/src/assets/font-awesome/fonts/fontawesome-webfont.svg +++ b/src/assets/font-awesome/fonts/fontawesome-webfont.svg @@ -310,7 +310,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -390,10 +390,25 @@ - + - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.ttf b/src/assets/font-awesome/fonts/fontawesome-webfont.ttf index 72e02925b..7ec2e1de8 100755 Binary files a/src/assets/font-awesome/fonts/fontawesome-webfont.ttf and b/src/assets/font-awesome/fonts/fontawesome-webfont.ttf differ diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.woff b/src/assets/font-awesome/fonts/fontawesome-webfont.woff index b450bfdcd..27d80b123 100755 Binary files a/src/assets/font-awesome/fonts/fontawesome-webfont.woff and b/src/assets/font-awesome/fonts/fontawesome-webfont.woff differ diff --git a/src/assets/font-awesome/less/path.less b/src/assets/font-awesome/less/path.less index 5b0b476cf..c5a691246 100644 --- a/src/assets/font-awesome/less/path.less +++ b/src/assets/font-awesome/less/path.less @@ -3,12 +3,12 @@ @font-face { font-family: 'FontAwesome'; -// src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); -// src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), -// url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), -// url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), -// url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); - src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); + src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), + url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), + url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), + url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); +// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; }