From 67b3e50cc83b84c23e71bcc1005a8e8115c5c0f8 Mon Sep 17 00:00:00 2001
From: Julien Deswaef <judeswae@thoughtworks.com>
Date: Mon, 5 Feb 2018 01:06:19 -0500
Subject: [PATCH] Renaming more stuff and removing Analytics tracking.

---
 README.md                                     |  8 +++----
 src/README.md-nobuild                         |  8 +++----
 src/_includes/footer.html                     |  5 ++--
 src/_includes/jumbotron-carousel.html         | 15 ++++--------
 src/_includes/navbar.html                     | 15 ------------
 src/_includes/newsletter-subscribe.html       | 16 -------------
 src/_includes/stripe-social.html              | 11 ++-------
 src/_includes/tell-me-thanks.html             | 22 ------------------
 src/_includes/thanks-to.html                  | 23 ++++---------------
 src/_includes/why.html                        | 12 +++++-----
 src/assets/font-awesome/HELP-US-OUT.txt       |  7 ------
 src/assets/less/site/bootstrap/variables.less |  2 +-
 src/community.html                            |  1 -
 13 files changed, 27 insertions(+), 118 deletions(-)
 delete mode 100644 src/_includes/newsletter-subscribe.html
 delete mode 100644 src/_includes/tell-me-thanks.html
 delete mode 100644 src/assets/font-awesome/HELP-US-OUT.txt

diff --git a/README.md b/README.md
index a2012ed63..d4dab39ba 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,8 @@ And constructed with the following guidelines:
 
 For more information on SemVer, please visit http://semver.org.
 
-## Original authors ot Font Awesome:
-- Email: dave@fontawesome.io
-- Twitter: http://twitter.com/davegandy
-- GitHub: https://github.com/davegandy
+## Original author of Font Awesome:
+- [Dave Gandy](https://github.com/davegandy)
 
 ## Component
 To include as a [component](https://github.com/componentjs/component), just run
@@ -54,7 +52,7 @@ Or add
 
 to the `dependencies` in your `component.json`.
 
-## Hacking on Font Awesome
+## Building on Fork Awesome
 
 **Before you can build the project**, you must first have the following installed:
 
diff --git a/src/README.md-nobuild b/src/README.md-nobuild
index 2b16c439e..b7801a414 100644
--- a/src/README.md-nobuild
+++ b/src/README.md-nobuild
@@ -40,10 +40,8 @@ And constructed with the following guidelines:
 
 For more information on SemVer, please visit http://semver.org.
 
-## Original authors ot Font Awesome:
-- Email: {{ site.fontawesome.author.email }}
-- Twitter: http://twitter.com/{{ site.fontawesome.author.twitter }}
-- GitHub: https://github.com/{{ site.fontawesome.author.github }}
+## Original author of Font Awesome:
+- [Dave Gandy](https://github.com/{{ site.fontawesome.author.github }})
 
 ## Component
 To include as a [component](https://github.com/componentjs/component), just run
@@ -56,7 +54,7 @@ Or add
 
 to the `dependencies` in your `component.json`.
 
-## Hacking on Font Awesome
+## Building on {{ site.forkawesome.name }}
 
 **Before you can build the project**, you must first have the following installed:
 
diff --git a/src/_includes/footer.html b/src/_includes/footer.html
index 81074e52e..b7cd91910 100644
--- a/src/_includes/footer.html
+++ b/src/_includes/footer.html
@@ -3,7 +3,7 @@
     <div>
       <i class="fa fa-fork" aria-hidden="true"></i> {{ site.forkawesome.name }} {{ site.forkawesome.version }}
       <span class="hide-xs">&middot;</span><br class="hide-sm hide-md hide-lg">
-      Originally created by <a href="https://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
+      A fork of Font Awesome, originally created by <a href="https://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
     </div>
     <div>
       {{ site.forkawesome.name }} licensed under <a href="{{ site.fontawesome.license.font.url }}">{{ site.fontawesome.license.font.version }}</a>
@@ -14,8 +14,7 @@
     </div>
     <div class="project">
       <a href="{{ site.forkawesome.github.url }}">GitHub Project</a> &middot;
-      <a href="{{ site.forkawesome.github.url }}/issues">Issues</a> &middot;
-      <a href="{{ page.relative_path }}3.2.1">Old 3.2.1 Docs</a>
+      <a href="{{ site.forkawesome.github.url }}/issues">Issues</a>
     </div>
   </div>
 </footer>
diff --git a/src/_includes/jumbotron-carousel.html b/src/_includes/jumbotron-carousel.html
index 9da38c5f9..1f0589cab 100644
--- a/src/_includes/jumbotron-carousel.html
+++ b/src/_includes/jumbotron-carousel.html
@@ -5,20 +5,16 @@
         <h1>{{ site.forkawesome.name }}</h1>
         <p>{{ site.forkawesome.tagline }}</p>
         <div class="actions">
-          <a class="btn btn-default btn-lg" href="#modal-download" data-toggle="modal"
-             onClick="_gaq.push(['_trackEvent', 'Launch Modal', 'Launch Download Modal']);">
+          <a class="btn btn-default btn-lg" href="#modal-download" data-toggle="modal">
             <i class="fa fa-download fa-lg" aria-hidden="true"></i>&nbsp;
             Download
           </a>
         </div>
         <div class="shameless-self-promotion">
-          Version {{ site.forkawesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-          <a href="{{ site.forkawesome.github.url }}"
-             onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);">
-            GitHub Project</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-          <a href="{{ page.relative_path }}3.2.1">Old 3.2.1 Docs</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-          Created by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
-        </div>
+          Version {{ site.forkawesome.version }}
+          &nbsp;&nbsp;&middot;&nbsp;&nbsp;
+          <a href="{{ site.forkawesome.github.url }}">GitHub Project</a>
+          </div>
       </div>
       <div class="col-md-4 col-sm-4">
         <div id="icon-carousel" class="carousel slide">
@@ -27,7 +23,6 @@
             <div class="item"><div><i class="fa fa-handshake-o" aria-hidden="true"></i><span class="sr-only">fort awesome icon</span></div></div>
             <div class="item"><div><i class="fa fa-bath" aria-hidden="true"></i><span class="sr-only">fort awesome icon</span></div></div>
             <div class="item"><div><i class="fa fa-envelope-open-o" aria-hidden="true"></i><span class="sr-only">fort awesome icon</span></div></div>
-            <div class="item"><div><i class="fa fa-fort-awesome" aria-hidden="true"></i><span class="sr-only">fort awesome icon</span></div></div>
             <div class="item"><div><i class="fa fa-commenting" aria-hidden="true"></i><span class="sr-only">commenting icon</span></div></div>
             <div class="item"><div><i class="fa fa-map-signs" aria-hidden="true"></i><span class="sr-only">map signs icon</span></div></div>
             <div class="item"><div><i class="fa fa-envelope" aria-hidden="true"></i><span class="sr-only">envelope icon</span></div></div>
diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html
index d2f9433a8..ba6c533f5 100644
--- a/src/_includes/navbar.html
+++ b/src/_includes/navbar.html
@@ -1,18 +1,3 @@
-<div class="hidden-print fa5" id="banner">
-  <div class="container">
-    <div class="message-container">
-      <div class="tagline">
-        <strong>Font Awesome 5 released!</strong> New icons, SVG, ligatures, &amp; tons more.
-      </div>
-      <div class="action">
-        <a id="rotating-url" class="btn btn-primary btn-lg btn-block" href="https://fontawesome.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_campaign=fa5_released&utm_content=banner" target="_blank">
-          Font Awesome 5 &nbsp;<i class='fas fas-external-link'></i>
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
-
 <div class="navbar navbar-inverse navbar-static-top hidden-print">
   <div class="container">
     <div class="navbar-header">
diff --git a/src/_includes/newsletter-subscribe.html b/src/_includes/newsletter-subscribe.html
deleted file mode 100644
index dd8916cff..000000000
--- a/src/_includes/newsletter-subscribe.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<form id="newsletter" method="post" action="https://formkeep.com/f/ba101f5b69f0">
-  <div class="row">
-    <div class="col-md-4 col-md-offset-2 col-sm-6">
-      <div class="form-group margin-bottom">
-        <input name="email" type="email" class="form-control" id="email" placeholder="Enter your email address&hellip;" required>
-      </div>
-    </div>
-    <div class="col-md-4 col-sm-6">
-      <button type="submit" class="btn btn-success btn-block margin-bottom-lg"
-          data-toggle="popover" data-trigger="hover" data-placement="top" title="Stay up to date with the Awesome"
-          data-content="We'll send you updates on new Font Awesome releases, icons, and other stuff that we're working on. We won't spam you. Scout's honor.">
-        Subscribe to Font Awesome Updates&nbsp;&nbsp;<i class="fa fa-envelope" aria-hidden="true"></i>
-      </button>
-    </div>
-  </div>
-</form>
diff --git a/src/_includes/stripe-social.html b/src/_includes/stripe-social.html
index 72dd70c97..a3303d759 100644
--- a/src/_includes/stripe-social.html
+++ b/src/_includes/stripe-social.html
@@ -1,18 +1,11 @@
 <div id="social-buttons" class="hidden-print">
   <div class="container">
-    {% include newsletter-subscribe.html %}
     <ul class="list-inline">
       <li>
-        <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=FortAwesome&repo=Font-Awesome&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
-      </li>
-      <li>
-        <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=FortAwesome&repo=Font-Awesome&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe>
-      </li>
-      <li class="follow-btn">
-        <a href="https://twitter.com/{{ site.fontawesome.twitter }}" class="twitter-follow-button" data-link-color="#000000" data-show-count="true">Follow @{{ site.fontawesome.twitter }}</a>
+        <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=ForkAwesome&repo=Fork-Awesome&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
       </li>
       <li class="tweet-btn hidden-phone">
-        <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.fontawesome.url }}" data-text="Font Awesome, the iconic font and CSS framework" data-counturl="{{ site.fontawesome.legacy_url }}" data-count="horizontal" data-via="{{ site.fontawesome.twitter }}" data-related="{{ site.fontawesome.author.twitter }}:Creator of Font Awesome">Tweet</a>
+        <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.forkawesome.url }}" data-text="Fork Awesome, a fork of the iconic font and CSS framework" data-counturl="{{ site.forkawesome.legacy_url }}" data-count="horizontal">Tweet</a>
       </li>
     </ul>
   </div>
diff --git a/src/_includes/tell-me-thanks.html b/src/_includes/tell-me-thanks.html
deleted file mode 100644
index 19e4d502f..000000000
--- a/src/_includes/tell-me-thanks.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<section id="tell-me-thanks">
-  <h2 class="page-header">Tell Me Thanks</h2>
-  <p class="lead">
-    Hopefully you think Font Awesome <em>is</em> awesome. I've put hundreds of hours into the project to give back to the
-    open source community. If you'd like, here are a couple of ways you can tell me thanks for all my hard work.
-  </p>
-  <div class="row">
-    <div class="col-md-6 col-sm-6">
-      <h3><a href="https://www.gittip.com/davegandy/"><i class="fa fa-gittip padding-right-sm" aria-hidden="true"></i>Tip me on Gittip</a></h3>
-      <p>
-        Gittip is a great way to let developers know you appreciate their work.
-      </p>
-    </div>
-    <div class="col-md-6 col-sm-6">
-      <h3><a href="http://amzn.com/w/G64X58AY416W" target="_blank">My Amazon Wish List</a></h3>
-      <p>
-        Or pick something straight
-        from <a href="http://amzn.com/w/G64X58AY416W" target="_blank">my wish list</a>. Gift cards are great.
-      </p>
-    </div>
-  </div>
-</section>
diff --git a/src/_includes/thanks-to.html b/src/_includes/thanks-to.html
index 8aebf591c..9e8a8ce02 100644
--- a/src/_includes/thanks-to.html
+++ b/src/_includes/thanks-to.html
@@ -1,25 +1,12 @@
 <section id="thanks-to">
   <h2 class="page-header">Thanks To</h2>
   <div class="row">
-    <div class="col-md-4 col-sm-4">
+    <div class="col-md-12 col-sm-12">
       <p>
-        Thanks to <a href="https://twitter.com/robmadole/">@robmadole</a> and
-        <a href="https://twitter.com/supercodepoet/">@supercodepoet</a> for icon design
-        review, advice, some Jekyll help, and being all around badass coders.
-      </p>
-    </div>
-    <div class="col-md-4 col-sm-4">
-      <p>
-        HUGE thanks to <a href="https://twitter.com/gtagliala">@gtagliala</a> for doing such a fantastic job managing
-        pull requests and issues on the Font Awesome
-        <a href="{{ site.fontawesome.github.url }}">GitHub project</a>.
-      </p>
-    </div>
-    <div class="col-md-4 col-sm-4">
-      <p>
-        Thanks to <a href="http://tracking.maxcdn.com/c/148092/3982/378"><i class="fa fa-maxcdn" aria-hidden="true">&nbsp;</i>MaxCDN</a> for providing the excellent
-        <a href="https://www.bootstrapcdn.com/fontawesome/">BootstrapCDN</a>, the fastest and easiest way to
-        <a href="{{ page.relative_path }}get-started/#bootstrapcdn">get started</a> with Font Awesome.
+        Thanks to <a href="https://twitter.com/davegandy">@davegandy</a> for his
+        original work on Font Awesome and to
+        <a href="https://twitter.com/gtagliala">@gtagliala</a> for managing pull
+        requests and issues on the Font Awesome Github repo.
       </p>
     </div>
   </div>
diff --git a/src/_includes/why.html b/src/_includes/why.html
index 1574d2c6c..a463ce944 100644
--- a/src/_includes/why.html
+++ b/src/_includes/why.html
@@ -2,11 +2,11 @@
   <div class="row">
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-flag" aria-hidden="true"></i> One Font, {{ icons | size }} Icons</h4>
-      In a single collection, Font Awesome is a pictographic language of web-related actions.
+      In a single collection, {{ site.forkawesome.name }} is a pictographic language of web-related actions.
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-ban" aria-hidden="true"></i> No JavaScript Required</h4>
-      Fewer compatibility concerns because Font Awesome doesn't require JavaScript.
+      Fewer compatibility concerns because {{ site.forkawesome.name }} doesn't require JavaScript.
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-arrows-alt" aria-hidden="true"></i> Infinite Scalability</h4>
@@ -14,7 +14,7 @@
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-microphone" aria-hidden="true"></i> Free, as in Speech</h4>
-      Font Awesome is completely free for commercial use. Check out the <a href="{{ page.relative_path }}license/">license</a>.
+      {{ site.forkawesome.name }} is completely free for commercial use. Check out the <a href="{{ page.relative_path }}license/">license</a>.
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-pencil" aria-hidden="true"></i> CSS Control</h4>
@@ -22,11 +22,11 @@
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-eye" aria-hidden="true"></i> Perfect on Retina Displays</h4>
-      Font Awesome icons are vectors, which mean they're gorgeous on high-resolution displays.
+      {{ site.forkawesome.name }} icons are vectors, which mean they're gorgeous on high-resolution displays.
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-gamepad" aria-hidden="true"></i> Plays Well with Others</h4>
-      Originally designed for <a href="{{ site.bootstrap.url }}">Bootstrap</a>, Font Awesome works great with all frameworks.
+      Originally designed for <a href="{{ site.bootstrap.url }}">Bootstrap</a>, {{ site.forkawesome.name }} works great with all frameworks.
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-desktop" aria-hidden="true"></i> Desktop Friendly</h4>
@@ -35,7 +35,7 @@
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-wheelchair" aria-hidden="true"></i> Accessibility-minded</h4>
-      Font Awesome <i class="fa fa-heart" aria-hidden="true"></i><span class="sr-only">loves</span> screen readers and
+      {{ site.forkawesome.name }} <i class="fa fa-heart" aria-hidden="true"></i><span class="sr-only">loves</span> screen readers and
 <a href="{{ page.relative_path }}accessibility/">helps make your icons accessible</a> on the web.
     </div>
   </div>
diff --git a/src/assets/font-awesome/HELP-US-OUT.txt b/src/assets/font-awesome/HELP-US-OUT.txt
deleted file mode 100644
index 83d083dd7..000000000
--- a/src/assets/font-awesome/HELP-US-OUT.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project,
-Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome,
-comprehensive icon sets or copy and paste your own.
-
-Please. Check it out.
-
--Dave Gandy
diff --git a/src/assets/less/site/bootstrap/variables.less b/src/assets/less/site/bootstrap/variables.less
index 0cb005b4b..6b2805e21 100644
--- a/src/assets/less/site/bootstrap/variables.less
+++ b/src/assets/less/site/bootstrap/variables.less
@@ -45,7 +45,7 @@
 @purple-light:          #c3b8f4;
 @purple-lighter:        #fbf5ff;
 
-@fa-green:              #1d9d74;
+@fa-green:              #00E;
 @fa-green-dark:         darken(@fa-green, 10%);
 
 @jumbotron-border:      mix(@fa-green, @fa-green-dark, 75%);
diff --git a/src/community.html b/src/community.html
index 6b0a7f113..31b96af62 100644
--- a/src/community.html
+++ b/src/community.html
@@ -29,5 +29,4 @@ relative_path: ../
   {% include community/project-milestones.html %}
 
   {% include thanks-to.html %}
-  {% include tell-me-thanks.html %}
 </div>