Merge branch 2.2RC2.2

2 files changed, 25 insertions, 1 deletions

diff --git a/library/font_awesome/src/_includes/modals/download.html b/library/font_awesome/src/_includes/modals/download.html
index a7105e69b..384620bdc 100644
--- a/library/font_awesome/src/_includes/modals/download.html
+++ b/library/font_awesome/src/_includes/modals/download.html
@@ -41,7 +41,7 @@
           </div>
         </div>
 
-        <a href="https://fortawesome.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=download_modal&utm_campaign=promo_5.0_update" class="btn btn-success btn-lg btn-block">
+        <a href="https://fortawesome.com/start?utm_source=font_awesome_homepage&utm_medium=display&utm_content=download_modal&utm_campaign=promo_{{ site.fontawesome.minor_version }}_update" class="btn btn-success btn-lg btn-block">
           Take your icon game <br class="visible-xs" />to the next level with
           <h2 class="margin-top-sm margin-bottom-sm hidden-xs"><i class="fas fas-fort-logo fas-lg valign-baseline"></i>&nbsp; Fort Awesome</h2>
           <h3 class="margin-top-sm margin-bottom-sm visible-xs"><i class="fas fas-fort-logo fas-lg valign-baseline"></i>&nbsp; Fort Awesome</h3>
diff --git a/library/font_awesome/src/_includes/modals/kickstarter.html b/library/font_awesome/src/_includes/modals/kickstarter.html
new file mode 100644
index 000000000..7f6f770eb
--- /dev/null
+++ b/library/font_awesome/src/_includes/modals/kickstarter.html
@@ -0,0 +1,24 @@
+<div class="modal fade" id="modal-kickstarter" tabindex="-1" role="dialog" aria-labelledby="modal-kickstarter-label"
+     xmlns="http://www.w3.org/1999/html">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times" aria-hidden="true"></i><span class="close"></span></button>
+        <h2 class="modal-title" id="modal-kickstarter-label">
+          <i class="fa fa-youtube-play fa-lg" aria-hidden="true"></i>&nbsp; Font Awesome 5!
+        </h2>
+      </div>
+      <div class="modal-body">
+
+        <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }</style>
+        <div class='embed-container'><iframe src='https://www.youtube.com/embed/CNoH3J7iSrA' frameborder='0' allowfullscreen></iframe></div>
+
+        <a class="btn btn-kickstarter btn-lg btn-block margin-top" href="http://five.fontawesome.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=kickstarter_modal&utm_campaign=promo_4.7_update"
+           onClick="_gaq.push(['_trackEvent', 'Outbound Modal Link', 'Check out the Kickstarter']);">
+          <h3 class="margin text-sans-serif strong">Check out the <br class="hide-sm hide-md hide-lg">Kickstarter! &nbsp;<i class="fa fa-external-link-square" aria-hidden="true"></i></h3>
+        </a>
+
+      </div>
+    </div>
+  </div>
+</div>