Updating icon files, path, and navbar icon

roterob · Oct 24, 2016 · 1645c76 · 1645c76
1 parent e26f4bc
commit 1645c76
Show file tree

Hide file tree

Showing 15 changed files with 5,354 additions and 1,381 deletions.
diff --git a/css/font-awesome.css b/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.7.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.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
@@ -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;
 }
diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html
@@ -71,7 +71,7 @@
           <ul class="dropdown-menu pull-right">
             <li><a href="{{ page.relative_path }}icons/"><i class="fa fa-flag fa-fw" aria-hidden="true"></i>&nbsp; All Icons</a></li>
             <li class="divider"></li>
-            <li><a href="{{ page.relative_path }}icons/#new"><i class="fa fa-wheelchair-alt fa-fw" aria-hidden="true"></i>&nbsp; New Icons in {{ site.fontawesome.minor_version }}</a></li>
+            <li><a href="{{ page.relative_path }}icons/#new"><i class="fa fa-handshake-o fa-fw" aria-hidden="true"></i>&nbsp; New Icons in {{ site.fontawesome.minor_version }}</a></li>
             <li><a href="{{ page.relative_path }}icons/#web-application"><i class="fa fa-camera-retro fa-fw" aria-hidden="true"></i>&nbsp; Web Application Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#accessibility"><i class="fa fa-universal-access fa-fw" aria-hidden="true"></i>&nbsp; Accessibility Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#hand"><i class="fa fa-hand-spock-o fa-fw" aria-hidden="true"></i>&nbsp; Hand Icons</a></li>

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
@@ -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;
 }