diff --git a/css/font-awesome.css b/css/font-awesome.css index d3379432c..c2d87a7e8 100644 --- a/css/font-awesome.css +++ b/css/font-awesome.css @@ -27,8 +27,7 @@ * -------------------------- */ @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'); + src: url('../fonts/FontAwesome.otf') format('opentype'); font-weight: normal; font-style: normal; } diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index e2bace081..04b25ee6f 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-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;} +@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;} .fa-lg{font-size:1.3333333333333333em;vertical-align:-10%;line-height:0.75em;} .fa.fa-fixed-width{display:inline-block;width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}.fa.fa-fixed-width.fa-lg{width:1.4285714285714286em;} .fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none;}.fa-ul>li{position:relative;} diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf index f7d9fb791..3889b44aa 100644 Binary files a/fonts/FontAwesome.otf and b/fonts/FontAwesome.otf differ diff --git a/less/path.less b/less/path.less index a8d87a71e..7377767f6 100644 --- a/less/path.less +++ b/less/path.less @@ -3,12 +3,12 @@ @font-face { font-family: 'FontAwesome'; - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}'); - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), - url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), - url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'), - url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg'); -// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts +// src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}'); +// src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), +// url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), +// url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'), +// url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg'); + src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/src/assets/font-awesome/fonts/FontAwesome.otf b/src/assets/font-awesome/fonts/FontAwesome.otf index f7d9fb791..3889b44aa 100644 Binary files a/src/assets/font-awesome/fonts/FontAwesome.otf and b/src/assets/font-awesome/fonts/FontAwesome.otf differ diff --git a/src/assets/font-awesome/less/path.less b/src/assets/font-awesome/less/path.less index a8d87a71e..7377767f6 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('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}'); - src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), - url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), - url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'), - url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg'); -// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts +// src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}'); +// src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), +// url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), +// url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'), +// url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg'); + src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; }