Explanation about the fork

5 files changed, 30 insertions, 27 deletions

diff --git a/_config.yml b/_config.yml
index 267d4364e..bcac0db1b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -45,6 +45,7 @@ forkawesome:
       url:          http://creativecommons.org/licenses/by/3.0/
 
 fontawesome:
+  name:           Font Awesome
   url:            http://fontawesome.com
   author:
     name:         Dave Gandy
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 421538176..c08efad0f 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -4,10 +4,10 @@
 $fa-font-path:        "../fonts" !default;
 $fa-font-size-base:   14px !default;
 $fa-line-height-base: 1 !default;
-//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts" !default; // for referencing Bootstrap CDN font files directly
-$fa-css-prefix:       fa !default;
-$fa-font-family:      FontAwesome !default;
-$fa-version:          "4.7.0" !default;
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome//fonts" !default; // for referencing Bootstrap CDN font files directly
+$fa-css-prefix:        !default;
+$fa-font-family:       !default;
+$fa-version:          "" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
 $fa-li-width:         (30em / 14) !default;
diff --git a/src/_includes/new-upgrading.html b/src/_includes/new-upgrading.html
index 5d2d88d93..8f985590a 100644
--- a/src/_includes/new-upgrading.html
+++ b/src/_includes/new-upgrading.html
@@ -1,10 +1,8 @@
 <section id="new-upgrading">
-  <h2 class="page-header">Upgrading from 3.2.1?</h2>
+  <h2 class="page-header">Switching from Font Awesome 4.7?</h2>
   <p>
-    For complete documentation of the syntax changes in {{ site.fontawesome.minor_version }}, check out the
-    <a href="{{ page.relative_path }}examples">examples</a>. For the changes to icon names,
-    <a href="https://twitter.com/gtagliala">@gtagliala</a> has put together a
-    <a href="{{ site.fontawesome.github.url }}/wiki/Upgrading-from-3.2.1-to-4">great wiki page</a> that
-    documents all the changes.
+    We are not there yet. This is still an early project. But we aim to make
+    process as easy and painless as possible. You are welcome to give us a hand
+    and get involved in the <a href="{{ page.relative_path }}community">community</a>.  
   </p>
 </section>
diff --git a/src/icons.yml b/src/icons.yml
index fece7209d..d3d12ef5a 100644
--- a/src/icons.yml
+++ b/src/icons.yml
@@ -6584,7 +6584,7 @@ icons:
   - name:       Mastodon
     id:         mastodon
     unicode:    f2e1
-    created:    5.0
+    created:    0.4
     url:        joinmastodon.org
     filter:
       - toot
@@ -6596,7 +6596,7 @@ icons:
   - name:       Mastodon Alt
     id:         mastodon-alt
     unicode:    f2e2
-    created:    5.0
+    created:    0.4
     url:        joinmastodon.org
     filter:
       - toot
diff --git a/src/whats-new.html b/src/whats-new.html
index b6215b06c..98944ec33 100644
--- a/src/whats-new.html
+++ b/src/whats-new.html
@@ -5,35 +5,39 @@ navbar_active: whats-new
 relative_path: ../
 ---
 {% capture jumbotron_h1 %}<i class="fa fa-lightbulb-o" aria-hidden="true"></i>&nbsp; What's New{% endcapture %}
-{% capture jumbotron_p %}What's New in the latest version &mdash; Font Awesome {{ site.fontawesome.minor_version }}{% endcapture %}
+{% capture jumbotron_p %}What's New with {{ site.forkawesome.name }} {{ site.forkawesome.minor_version }}{% endcapture %}
 
 {% include jumbotron.html %}
 {% include stripe-social.html %}
 
 <div class="container">
-  {% capture stripe_ad_content %}
   <p class="lead">
-    Font Awesome is always getting a little awesome-er. So here's what's new in the latest version, Font Awesome
-    {{ site.fontawesome.minor_version }}. Have some ideas for new features?
-    <a href="{{ page.relative_path }}community/">Help contribute</a>.
+    {{ site.forkawesome.name }} is community effort base on
+    {{ site.fontawesome.name }} {{ site.fontawesome.version }} by
+    {{ site.fontawesome.author.name }}. We <i class="fa fa-heart" aria-hidden="true"></i>
+    {{ site.fontawesome.name }} but here's why we forked it into {{ site.forkawesome.name }}
+    {{ site.forkawesome.minor_version }}. Want to
+    <a href="{{ page.relative_path }}community/">help contribute</a>?
   </p>
-  {% endcapture %}
 
   <div class="row feature-list">
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa fa-universal-access" aria-hidden="true"></i> <a href="{{ page.relative_path }}accessibility">Accessibility Docs</a></h4>
-      Details on how to mark up your icons depending on how you're using them.
-      Make your site icons usable by the most people, and start here.
+      <h4><i class="fa fa-code-fork" aria-hidden="true"></i> PR freeze</h4>
+      Since Oct 22, 2016, Font Awesome has frozen all pull requests proposing new
+      icons. With {{ site.forkawesome.name }}, we are welcoming all your pull
+      requests.
     </div>
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa fa-code" aria-hidden="true"></i> Better Examples</h4>
-      Every FA icon example page now has a better, more accessibility-minded
-      default block of code that users can copy and paste.
+      <h4><i class="fa fa-fort-awesome" aria-hidden="true"></i> Font Awesome 5.0</h4>
+      Fort Awesome has ran a very successful kickstarter campaign and completely
+      redesigned Font Awesome in this new version 5.0. Fork Awesome plans to keep
+      the old look from alive.
     </div>
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa fa-wheelchair-alt" aria-hidden="true"></i> <a href="{{ page.relative_path }}icons/#accessibility">Accessibility Category</a></h4>
-      We've added a new icon category specifically for accessibility and seeded
-      it with 15 icons to start. Make sure to <a href="{{ page.relative_path }}community/#requesting-new-icons">request more</a> if you need them!
+      <h4><i class="fa fa-users" aria-hidden="true"></i> Distributed community</h4>
+      We'd like to turn this into a distributed open source design project,
+      where all contributions are included and credited. So
+      <a href="{{ page.relative_path }}community">join our community</a>.
     </div>
   </div>