Renaming font files

10 files changed, 24 insertions, 25 deletions

diff --git a/src/Makefile b/src/Makefile
index 80e243f14..0fde83c8e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,16 +2,16 @@
 ---
 PATH := ../node_modules/.bin:$(PATH)
 
-FA_ROOT_DIRECTORY = assets/font-awesome
-FA_LESS_DIRECTORY = assets/font-awesome/less
-FA_SCSS_DIRECTORY = assets/font-awesome/scss
-FA_CSS_DIRECTORY = assets/font-awesome/css
+FA_ROOT_DIRECTORY = assets/fork-awesome
+FA_LESS_DIRECTORY = assets/fork-awesome/less
+FA_SCSS_DIRECTORY = assets/fork-awesome/scss
+FA_CSS_DIRECTORY = assets/fork-awesome/css
 
-FA_LESS_MODERN = ${FA_LESS_DIRECTORY}/font-awesome.less
-FA_SCSS_MODERN = ${FA_SCSS_DIRECTORY}/font-awesome.scss
+FA_LESS_MODERN = ${FA_LESS_DIRECTORY}/fork-awesome.less
+FA_SCSS_MODERN = ${FA_SCSS_DIRECTORY}/fork-awesome.scss
 
-FA_CSS_MODERN = ${FA_CSS_DIRECTORY}/font-awesome.css
-FA_CSS_MODERN_MIN = ${FA_CSS_DIRECTORY}/font-awesome.min.css
+FA_CSS_MODERN = ${FA_CSS_DIRECTORY}/fork-awesome.css
+FA_CSS_MODERN_MIN = ${FA_CSS_DIRECTORY}/fork-awesome.min.css
 
 SITE_LESS_DIRECTORY = assets/less
 SITE_CSS_DIRECTORY = assets/css
@@ -24,13 +24,13 @@ build:
 	@mkdir -p ${FA_CSS_DIRECTORY}
 
 	bundle exec lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN}
-	bundle exec lessc --compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN}
+	bundle exec lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN}
 #	sass ${FA_SCSS_MODERN} ${FA_CSS_MODERN}
 
-	bundle exec lessc --compress ${SITE_LESS} > ${SITE_CSS}
+	bundle exec lessc  ${SITE_LESS} > ${SITE_CSS}
 	cp -r ${FA_ROOT_DIRECTORY}/* ../
 	mv README.md-nobuild ../README.md
-	cd assets && mv font-awesome font-awesome-{{ site.fontawesome.version }} && zip -r9 font-awesome-{{ site.fontawesome.version }}.zip font-awesome-{{ site.fontawesome.version }} && mv font-awesome-{{ site.fontawesome.version }} font-awesome
+	cd assets && mv fork-awesome fork-awesome-{{ site.forkawesome.version }} && zip -r9 fork-awesome-{{ site.forkawesome.version }}.zip fork-awesome-{{ site.forkawesome.version }} && mv fork-awesome-{{ site.forkawesome.version }} fork-awesome
 
 	find .. -type f ! -perm 644 -exec chmod 644 {} \;
 
diff --git a/src/assets/font-awesome/fonts/FontAwesome.otf b/src/assets/font-awesome/fonts/ForkAwesome.otf
index c8efe6c42..c8efe6c42 100644
--- a/src/assets/font-awesome/fonts/FontAwesome.otf
+++ b/src/assets/font-awesome/fonts/ForkAwesome.otf
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.eot b/src/assets/font-awesome/fonts/forkawesome-webfont.eot
index cef8c4d79..cef8c4d79 100644
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.eot
+++ b/src/assets/font-awesome/fonts/forkawesome-webfont.eot
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.svg b/src/assets/font-awesome/fonts/forkawesome-webfont.svg
index 1753c0ada..41b217e86 100644
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.svg
+++ b/src/assets/font-awesome/fonts/forkawesome-webfont.svg
@@ -7,9 +7,9 @@ Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
 Copyright Dave Gandy 2016. All rights reserved.
 </metadata>
 <defs>
-<font id="FontAwesome" horiz-adv-x="1536" >
+<font id="ForkAwesome" horiz-adv-x="1536" >
   <font-face
-    font-family="FontAwesome"
+    font-family="ForkAwesome"
     font-weight="400"
     font-stretch="normal"
     units-per-em="1792"
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.ttf b/src/assets/font-awesome/fonts/forkawesome-webfont.ttf
index ee5821438..ee5821438 100644
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.ttf
+++ b/src/assets/font-awesome/fonts/forkawesome-webfont.ttf
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.woff b/src/assets/font-awesome/fonts/forkawesome-webfont.woff
index 264d9995b..264d9995b 100644
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.woff
+++ b/src/assets/font-awesome/fonts/forkawesome-webfont.woff
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.woff2 b/src/assets/font-awesome/fonts/forkawesome-webfont.woff2
index 036d17290..036d17290 100644
--- a/src/assets/font-awesome/fonts/fontawesome-webfont.woff2
+++ b/src/assets/font-awesome/fonts/forkawesome-webfont.woff2
diff --git a/src/assets/font-awesome/less/icons.less b/src/assets/font-awesome/less/icons.less
index 1d29b69a6..38cdb7bde 100644
--- a/src/assets/font-awesome/less/icons.less
+++ b/src/assets/font-awesome/less/icons.less
@@ -1,6 +1,6 @@
 ---
 ---
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+/* {{ site.forkawesome.name }} uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
 {% for icon in icons %}{% for alias in icon.aliases %}
 .@{fa-css-prefix}-{{ alias }}:before,{% endfor %}
diff --git a/src/assets/font-awesome/less/path.less b/src/assets/font-awesome/less/path.less
index 2164ff303..cd1544fdf 100644
--- a/src/assets/font-awesome/less/path.less
+++ b/src/assets/font-awesome/less/path.less
@@ -3,13 +3,13 @@
 
 @font-face {
   font-family: '@{fa-font-family}';
-  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}/forkawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/forkawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/forkawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
+    url('@{fa-font-path}/forkawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/forkawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/forkawesome-webfont.svg?v=@{fa-version}#forkawesomeregular') format('svg');
+  // src: url('@{fa-font-path}/ForkAwesome.otf') format('opentype'); // used when developing fonts
   font-weight: normal;
   font-style: normal;
 }
diff --git a/src/assets/font-awesome/less/variables.less b/src/assets/font-awesome/less/variables.less
index 74ded185a..9b3ed2f68 100644
--- a/src/assets/font-awesome/less/variables.less
+++ b/src/assets/font-awesome/less/variables.less
@@ -6,10 +6,9 @@
 @fa-font-path:        "../fonts";
 @fa-font-size-base:   14px;
 @fa-line-height-base: 1;
-//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/{{site.fontawesome.version}}/fonts"; // for referencing Bootstrap CDN font files directly
-@fa-css-prefix:       {{ site.fontawesome.css_prefix }};
-@fa-font-family:      {{ site.fontawesome.font_family }};
-@fa-version:          "{{ site.fontawesome.version }}";
+@fa-css-prefix:       {{ site.forkawesome.css_prefix }};
+@fa-font-family:      {{ site.forkawesome.font_family }};
+@fa-version:          "{{ site.forkawesome.version }}";
 @fa-border-color:     #eee;
 @fa-inverse:          #fff;
 @fa-li-width:         (30em / 14);