update font-awesome library to 4.6.1

Perhaps this should be done as a submodule instead?

1 files changed, 59 insertions, 2 deletions

diff --git a/library/font_awesome/src/license.html b/library/font_awesome/src/license.html
index 990071460..1cceb0493 100644
--- a/library/font_awesome/src/license.html
+++ b/library/font_awesome/src/license.html
@@ -4,12 +4,69 @@ title: Font Awesome License
 navbar_active: license
 relative_path: ../
 ---
-{% capture jumbotron_h1 %}<i class="icon-legal icon-large"></i>&nbsp; License{% endcapture %}
+{% capture jumbotron_h1 %}<i class="fa fa-gavel" aria-hidden="true"></i>&nbsp; License{% endcapture %}
 {% capture jumbotron_p %}The full details of how Font Awesome is licensed{% endcapture %}
 
 {% include jumbotron.html %}
 {% include stripe-social.html %}
 
 <div class="container">
-  {% include license.html %}
+  {% capture stripe_ad_content %}
+  <p class="lead">
+    Font Awesome is fully open source and is GPL friendly. You can use it for commercial projects, open source
+    projects, or really just about whatever you want.
+  </p>
+  {% endcapture %}
+  {% include stripe-ad.html %}
+
+  <section>
+    <div class="alert alert-success">
+      <ul class="fa-ul margin-bottom-none">
+        <li>
+          <i class="fa-li fa fa-info-circle fa-lg" aria-hidden="true"></i>Attribution is no longer required as of Font Awesome 3.0 but is much appreciated:
+          "Font Awesome by Dave Gandy - http://fontawesome.io".
+        </li>
+      </ul>
+    </div>
+  </section>
+
+  <section>
+    <h2 class="page-header">Font License</h2>
+    <ul>
+      <li>
+        Applies to all desktop and webfont files in the following directory:
+        <code>font-awesome/fonts/</code>.
+      </li>
+      <li>License: {{ site.fontawesome.license.font.version }}</li>
+      <li>URL: <a href="{{ site.fontawesome.license.font.url }}">{{ site.fontawesome.license.font.url }}</a></li>
+    </ul>
+  </section>
+
+  <section>
+    <h2 class="page-header">Code License</h2>
+    <ul>
+      <li>
+        Applies to all CSS and LESS files in the following directories:
+        <code>font-awesome/css/</code>,
+        <code>font-awesome/less/</code>, and
+        <code>font-awesome/scss/</code>.
+      </li>
+      <li>License: {{ site.fontawesome.license.code.version }}</li>
+      <li>URL: <a href="{{ site.fontawesome.license.code.url }}">{{ site.fontawesome.license.code.url }}</a></li>
+    </ul>
+  </section>
+
+  <section>
+    <h2 class="page-header">Documentation License</h2>
+    <ul>
+      <li>Applies to all Font Awesome project files that are not a part of the Font or Code licenses.</li>
+      <li>License: {{ site.fontawesome.license.documentation.version }}</li>
+      <li>URL: <a href="{{ site.fontawesome.license.documentation.url }}">{{ site.fontawesome.license.documentation.url }}</a></li>
+    </ul>
+  </section>
+
+  <section>
+    <h2 class="page-header">Brand Icons</h2>
+    {% include brand-license.html %}
+  </section>
 </div>