diff --git a/css/font-awesome.css b/css/font-awesome.css index bdddfd977..f9d4aa35c 100644 --- a/css/font-awesome.css +++ b/css/font-awesome.css @@ -27,7 +27,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../font/FontAwesome.otf') format('opentype'); + src: url('../font/fontawesome-webfont.eot?v=3.2.0'); + src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg'); font-weight: normal; font-style: normal; } diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index d38cb8624..8f7fbfe2e 100644 --- a/css/font-awesome.min.css +++ b/css/font-awesome.min.css @@ -1,4 +1,4 @@ -@font-face{font-family:'FontAwesome';src:url('../font/FontAwesome.otf') format('opentype');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;} +@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;} [class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;cursor:default;speak:none;} .icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;} a [class^="icon-"],a [class*=" icon-"]{display:inline;} diff --git a/font/fontawesome-webfont.eot b/font/fontawesome-webfont.eot index c080283bd..0662cb96b 100755 Binary files a/font/fontawesome-webfont.eot and b/font/fontawesome-webfont.eot differ diff --git a/font/fontawesome-webfont.svg b/font/fontawesome-webfont.svg index 10a1e1bbf..2edb4ec34 100755 --- a/font/fontawesome-webfont.svg +++ b/font/fontawesome-webfont.svg @@ -52,8 +52,8 @@ - - + + @@ -63,7 +63,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -317,8 +317,8 @@ - - + + @@ -333,7 +333,67 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/font/fontawesome-webfont.ttf b/font/fontawesome-webfont.ttf index 908f69ec9..d36592469 100755 Binary files a/font/fontawesome-webfont.ttf and b/font/fontawesome-webfont.ttf differ diff --git a/font/fontawesome-webfont.woff b/font/fontawesome-webfont.woff index a33af950a..b9bd17e15 100755 Binary files a/font/fontawesome-webfont.woff and b/font/fontawesome-webfont.woff differ diff --git a/less/path.less b/less/path.less index bda49e198..8ccef8cf0 100644 --- a/less/path.less +++ b/less/path.less @@ -3,13 +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#fontawesomeregular?v=@{FontAwesomeVersion}') 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#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg'); +// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/scss/_path.scss b/scss/_path.scss index c4fa9423f..f943b26ff 100644 --- a/scss/_path.scss +++ b/scss/_path.scss @@ -1,10 +1,14 @@ -// FONT PATH +/* FONT PATH + * -------------------------- */ @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#fontawesomeregular?v=#{$FontAwesomeVersion}") format("svg"); - //src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype') // used when developing fonts + 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#fontawesomeregular?v=${FontAwesomeVersion}') 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/font/fontawesome-webfont.eot b/src/assets/font-awesome/font/fontawesome-webfont.eot index c080283bd..0662cb96b 100755 Binary files a/src/assets/font-awesome/font/fontawesome-webfont.eot and b/src/assets/font-awesome/font/fontawesome-webfont.eot differ diff --git a/src/assets/font-awesome/font/fontawesome-webfont.svg b/src/assets/font-awesome/font/fontawesome-webfont.svg index 10a1e1bbf..2edb4ec34 100755 --- a/src/assets/font-awesome/font/fontawesome-webfont.svg +++ b/src/assets/font-awesome/font/fontawesome-webfont.svg @@ -52,8 +52,8 @@ - - + + @@ -63,7 +63,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -317,8 +317,8 @@ - - + + @@ -333,7 +333,67 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/font-awesome/font/fontawesome-webfont.ttf b/src/assets/font-awesome/font/fontawesome-webfont.ttf index 908f69ec9..d36592469 100755 Binary files a/src/assets/font-awesome/font/fontawesome-webfont.ttf and b/src/assets/font-awesome/font/fontawesome-webfont.ttf differ diff --git a/src/assets/font-awesome/font/fontawesome-webfont.woff b/src/assets/font-awesome/font/fontawesome-webfont.woff index a33af950a..b9bd17e15 100755 Binary files a/src/assets/font-awesome/font/fontawesome-webfont.woff and b/src/assets/font-awesome/font/fontawesome-webfont.woff differ diff --git a/src/assets/font-awesome/less/path.less b/src/assets/font-awesome/less/path.less index bda49e198..8ccef8cf0 100644 --- a/src/assets/font-awesome/less/path.less +++ b/src/assets/font-awesome/less/path.less @@ -3,13 +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#fontawesomeregular?v=@{FontAwesomeVersion}') 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#fontawesomeregular?v=@{FontAwesomeVersion}') 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/scss/_path.scss b/src/assets/font-awesome/scss/_path.scss index c4fa9423f..f943b26ff 100644 --- a/src/assets/font-awesome/scss/_path.scss +++ b/src/assets/font-awesome/scss/_path.scss @@ -1,10 +1,14 @@ -// FONT PATH +/* FONT PATH + * -------------------------- */ @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#fontawesomeregular?v=#{$FontAwesomeVersion}") format("svg"); - //src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype') // used when developing fonts + 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#fontawesomeregular?v=${FontAwesomeVersion}') format('svg'); +// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; }