Browse Source

Appears to fix icon height #8101

Dave Gandy 9 years ago
parent
commit
49e8997098

+ 2 - 1
css/font-awesome.css

@@ -6,7 +6,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/FontAwesome.otf') format('opentype');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.6.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.6.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.6.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.6.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.6.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

File diff suppressed because it is too large
+ 0 - 0
css/font-awesome.min.css


+ 58 - 0
fonts/4.4.0/index.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.css" />
+  </head>
+
+  <body>
+    <h1>4.4.0</h1>
+    <table>
+      <tr>
+        <td><i class="fa fa-1x fa-file-pdf-o"></i></td>
+        <td><i class="fa fa-1x fa-cog"></i></td>
+        <td><i class="fa fa-1x fa-shield"></i></td>
+        <td><i class="fa fa-1x fa-ship"></i></td>
+        <td><i class="fa fa-1x fa-angle-double-up"></i></td>
+        <td><i class="fa fa-1x fa-angle-double-down"></i></td>
+        <td><i class="fa fa-1x fa-file-o"></i></td>
+      </tr>
+      <tr>
+        <td><i class="fa fa-2x fa-file-pdf-o"></i></td>
+        <td><i class="fa fa-2x fa-cog"></i></td>
+        <td><i class="fa fa-2x fa-shield"></i></td>
+        <td><i class="fa fa-2x fa-ship"></i></td>
+        <td><i class="fa fa-2x fa-angle-double-up"></i></td>
+        <td><i class="fa fa-2x fa-angle-double-down"></i></td>
+        <td><i class="fa fa-2x fa-file-o"></i></td>
+      </tr>
+      <tr>
+        <td><i class="fa fa-3x fa-file-pdf-o"></i></td>
+        <td><i class="fa fa-3x fa-cog"></i></td>
+        <td><i class="fa fa-3x fa-shield"></i></td>
+        <td><i class="fa fa-3x fa-ship"></i></td>
+        <td><i class="fa fa-3x fa-angle-double-up"></i></td>
+        <td><i class="fa fa-3x fa-angle-double-down"></i></td>
+        <td><i class="fa fa-3x fa-file-o"></i></td>
+      </tr>
+      <tr>
+        <td><i class="fa fa-4x fa-file-pdf-o"></i></td>
+        <td><i class="fa fa-4x fa-cog"></i></td>
+        <td><i class="fa fa-4x fa-shield"></i></td>
+        <td><i class="fa fa-4x fa-ship"></i></td>
+        <td><i class="fa fa-4x fa-angle-double-up"></i></td>
+        <td><i class="fa fa-4x fa-angle-double-down"></i></td>
+        <td><i class="fa fa-4x fa-file-o"></i></td>
+      </tr>
+      <tr>
+        <td><i class="fa fa-5x fa-file-pdf-o"></i></td>
+        <td><i class="fa fa-5x fa-cog"></i></td>
+        <td><i class="fa fa-5x fa-shield"></i></td>
+        <td><i class="fa fa-5x fa-ship"></i></td>
+        <td><i class="fa fa-5x fa-angle-double-up"></i></td>
+        <td><i class="fa fa-5x fa-angle-double-down"></i></td>
+        <td><i class="fa fa-5x fa-file-o"></i></td>
+      </tr>
+    </table>
+  </body>
+
+</html>

BIN
fonts/fontawesome-webfont.eot


File diff suppressed because it is too large
+ 3 - 3
fonts/fontawesome-webfont.svg


BIN
fonts/fontawesome-webfont.ttf


BIN
fonts/fontawesome-webfont.woff


BIN
fonts/fontawesome-webfont.woff2


+ 7 - 7
less/path.less

@@ -3,13 +3,13 @@
 
 @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?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
   font-weight: normal;
   font-style: normal;
 }

BIN
src/assets/font-awesome/fonts/fontawesome-webfont.eot


File diff suppressed because it is too large
+ 3 - 3
src/assets/font-awesome/fonts/fontawesome-webfont.svg


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.ttf


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.woff


BIN
src/assets/font-awesome/fonts/fontawesome-webfont.woff2


+ 7 - 7
src/assets/font-awesome/less/path.less

@@ -3,13 +3,13 @@
 
 @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?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
   font-weight: normal;
   font-style: normal;
 }

Some files were not shown because too many files changed in this diff