Adding webfont formats

FortAwesome · Jul 28, 2015 · a1f22ec · a1f22ec
1 parent d2d4eb2
commit a1f22ec
Show file tree

Hide file tree

Showing 14 changed files with 284 additions and 164 deletions.
diff --git a/css/font-awesome.css b/css/font-awesome.css
@@ -7,7 +7,7 @@
 @font-face {
   font-family: 'FontAwesome';
   src: url('../fonts/fontawesome-webfont.eot?v=4.4.0');
-  src: url('../fonts/FontAwesome.otf') format('opentype');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2
diff --git a/less/path.less b/less/path.less
@@ -4,12 +4,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.woff2?v=@{fa-version}') format('woff2'),
-//    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?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
+    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
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.svg b/src/assets/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.ttf b/src/assets/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.woff b/src/assets/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.woff2 b/src/assets/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/src/assets/font-awesome/less/path.less b/src/assets/font-awesome/less/path.less
@@ -4,12 +4,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.woff2?v=@{fa-version}') format('woff2'),
-//    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?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
+    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;
 }