Adding Kickstarter widget

diff --git a/src/_includes/jumbotron-carousel.html b/src/_includes/jumbotron-carousel.html
index bf938adecafe6539f385495adc2d5fd994f62da7..52aa766e67955c741266d3240101d64a03773b78 100644 (file)
--- a/src/_includes/jumbotron-carousel.html
+++ b/src/_includes/jumbotron-carousel.html
@@ -1,7 +1,7 @@
 <div class="jumbotron jumbotron-carousel hidden-print">
   <div class="container">
     <div class="row">
-      <div class="col-md-8 col-sm-8 text-center">
+      <div class="col-md-9 col-sm-8 text-center">
         <h1>Font Awesome</h1>
         <p>The iconic font and CSS toolkit</p>
         <div class="actions">
@@ -20,9 +20,11 @@
           Created by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
         </div>
       </div>
-      <div class="col-md-4 col-sm-4">
-        <div id="icon-carousel" class="carousel slide">
-          <!-- Carousel items -->
+      <div class="col-md-3 col-sm-4">
+        <div id="kickstarter-widget" class="kickstarter-widget-index">
+          {% include kickstarter-widget.html %}
+        </div>
+        <!-- <div id="icon-carousel" class="carousel slide">
           <div class="carousel-inner">
             <div class="active item"><div><i class="fa fa-font-awesome" aria-hidden="true"></i><span class="sr-only">flag icon</span></div></div>
             <div class="item"><div><i class="fa fa-handshake-o" aria-hidden="true"></i><span class="sr-only">fort awesome icon</span></div></div>
@@ -40,7 +42,6 @@
             <div class="item"><div><i class="fa fa-thumbs-o-up" aria-hidden="true"></i><span class="sr-only">thumbs up icon</span></div></div>
             <div class="item"><div><i class="fa fa-pied-piper-alt" aria-hidden="true"></i><span class="sr-only">pied piper icon</span></div></div>
           </div>
-          <!-- Carousel nav -->
           <a class="carousel-control left" href="#icon-carousel" data-slide="prev"
              onClick="_gaq.push(['_trackEvent', 'iconCarousel', 'Prev']);">
             <i class="fa fa-arrow-circle-left" aria-hidden="true"></i>
@@ -51,7 +52,7 @@
             <i class="fa fa-arrow-circle-right" aria-hidden="true"></i>
             <span class="sr-only">Next</span>
           </a>
-        </div>
+        </div> -->
       </div>
     </div>
 

diff --git a/src/_includes/jumbotron.html b/src/_includes/jumbotron.html
index 93920f7a7139f6c3bbdc29c757452a3e4c649b2e..33608b81b66dcc0990353abf9af41a40352f7552 100644 (file)
--- a/src/_includes/jumbotron.html
+++ b/src/_includes/jumbotron.html
@@ -1,19 +1,17 @@
 <div class="jumbotron jumbotron-ad hidden-print">
   <div class="container">
 
-    {% if page.in_page_nav %}
-    <div class="col-md-9">
-      <h1>{{ jumbotron_h1 }}</h1>
-      <p>{{ jumbotron_p }}</p>
+    <div class="jumbotron-kickstarter">
+      <div class="jumbotron-text">
+        <h1>{{ jumbotron_h1 }}</h1>
+        <p>{{ jumbotron_p }}</p>
+      </div>
+      <div class="jumbotron-ks-ad">
+        <div id="kickstarter-widget" class="kickstarter-widget-index">
+          {% include kickstarter-widget.html %}
+        </div>
+      </div>
     </div>
 
-    <div class="col-md-3">
-      {{ jumbotron_nav }}
-    </div>
-    {% else %}
-    <h1>{{ jumbotron_h1 }}</h1>
-    <p>{{ jumbotron_p }}</p>
-    {% endif %}
   </div>
-
 </div>

diff --git a/src/_includes/kickstarter-widget.html b/src/_includes/kickstarter-widget.html
new file mode 100644 (file)
index 0000000..68cfa01
--- /dev/null
+++ b/src/_includes/kickstarter-widget.html
@@ -0,0 +1 @@
+<iframe frameborder="0" height="420" scrolling="no" src="https://www.kickstarter.com/projects/232193852/font-awesome-5/widget/card.html?v=2" width="220"></iframe>

diff --git a/src/_includes/newsletter-subscribe.html b/src/_includes/newsletter-subscribe.html
new file mode 100644 (file)
index 0000000..dd8916c
--- /dev/null
+++ b/src/_includes/newsletter-subscribe.html
@@ -0,0 +1,16 @@
+<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 9529bbd962e5953d9c8717e093390cbcee8d2804..72dd70c9746d4887549d2a245625f7dee0b1c965 100644 (file)
--- a/src/_includes/stripe-social.html
+++ b/src/_includes/stripe-social.html
@@ -1,22 +1,6 @@
 <div id="social-buttons" class="hidden-print">
   <div class="container">
-    <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>
-
+    {% 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>
@@ -25,7 +9,7 @@
         <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="#0069D6" data-show-count="true">Follow @{{ site.fontawesome.twitter }}</a>
+        <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>
       </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>

diff --git a/src/assets/js/site.js b/src/assets/js/site.js
index b070e800b4c64d61b597f91d28d33681b9a88b2c..1b6cfbed71908104a7503b236f2cbc575a3a7c1c 100644 (file)
--- a/src/assets/js/site.js
+++ b/src/assets/js/site.js
@@ -44,6 +44,12 @@ $(function () {
       url: "https://www.kickstarter.com/projects/232193852/font-awesome-5?ref=fontawesome-banner",
       btn_text: "Check out the Kickstarter",
     },
+    {
+      quote: "Save 50% with the early backer price until Monday! Just $20!",
+      class: "kickstarter",
+      url: "https://www.kickstarter.com/projects/232193852/font-awesome-5?ref=fontawesome-banner",
+      btn_text: "Font Awesome 5 Kickstarter",
+    },
   ];
 
   selectAd();

diff --git a/src/assets/less/site.less b/src/assets/less/site.less
index 7b074c7eeb82cb21cbaa550b6f8eba7eeb91b517..125b3fd36a8072589e5e5e03e24d3f6f6d8d0932 100644 (file)
--- a/src/assets/less/site.less
+++ b/src/assets/less/site.less
@@ -34,6 +34,7 @@
 @import "site/sumome";
 @import "site/algolia";
 @import "site/kickstarter";
+@import "site/newsletter";
 
 @import "site/views";
 @import "site/store";

diff --git a/src/assets/less/site/kickstarter.less b/src/assets/less/site/kickstarter.less
index 689a8c04ab69352878719d776f28de177ac55223..65b3cf8a63d85f411888b29624aec6bb2fd223ad 100644 (file)
--- a/src/assets/less/site/kickstarter.less
+++ b/src/assets/less/site/kickstarter.less
@@ -1,3 +1,13 @@
 .btn-kickstarter {
   .button-variant(#fff, #489fdf, mix(#000,#489fdf,10%));
 }
+
+#kickstarter-widget {
+  margin: -30px auto -70px;
+  width: 220px;
+}
+
+.jumbotron-ad .well {
+  background-color: rgba(255,255,255,.3);
+  border-color: rgba(255,255,255,.15);
+}

diff --git a/src/assets/less/site/newsletter.less b/src/assets/less/site/newsletter.less
new file mode 100644 (file)
index 0000000..6822f01
--- /dev/null
+++ b/src/assets/less/site/newsletter.less
@@ -0,0 +1,14 @@
+.jumbotron-ad #newsletter {
+  .btn {
+    color: @jumbotron-color;
+    border-color: mix(@jumbotron-color, @jumbotron-bg, 75%);
+    background-color: transparent;
+    text-shadow: 0 1px 0 rgba(0,0,0,0.15);
+    &:hover {
+      background-color: mix(@jumbotron-color, @jumbotron-bg, 95%);
+      border-color: mix(@jumbotron-color, @jumbotron-bg, 95%);
+      color: @jumbotron-bg;
+      text-shadow: 0 -1px 0 @jumbotron-color;
+    }
+  }
+}

diff --git a/src/assets/less/site/responsive/screen-lg.less b/src/assets/less/site/responsive/screen-lg.less
index ae404bb8ec502b836881f5cbf4b60aa555aae312..1205e44c7de96f89d02b73f5d9a218e4991e21f2 100644 (file)
--- a/src/assets/less/site/responsive/screen-lg.less
+++ b/src/assets/less/site/responsive/screen-lg.less
@@ -55,4 +55,11 @@
   }
 
   .hide-lg { display: none; }
+
+  .jumbotron-ad #newsletter {
+    margin-top: 30px;
+    margin-right: 250px;
+    margin-bottom: -70px;
+  }
+
 }

diff --git a/src/assets/less/site/responsive/screen-sm-up.less b/src/assets/less/site/responsive/screen-sm-up.less
index b7037e54d0f8a1951076b9264ed5277db672642e..78c9d1226bdb6e42e1248c3d2f32ec7247a8b403 100644 (file)
--- a/src/assets/less/site/responsive/screen-sm-up.less
+++ b/src/assets/less/site/responsive/screen-sm-up.less
@@ -15,4 +15,12 @@
     }
   }
 
+  .jumbotron-kickstarter {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: center;
+  }
+
 }

diff --git a/src/assets/less/site/responsive/screen-sm.less b/src/assets/less/site/responsive/screen-sm.less
index 4c782ca228846edfbac139b6cde797a015e452d0..c6a9efea4916c008dae948a1257eab357e6c00b1 100644 (file)
--- a/src/assets/less/site/responsive/screen-sm.less
+++ b/src/assets/less/site/responsive/screen-sm.less
@@ -45,5 +45,10 @@
 
   .hide-sm { display: none; }
   .v-get-started .get-started-cdn { padding: 5px 22px 22px 22px; }
-  
+
+
+  // .jumbotron-ks-ad { flex-basis: 25%; }
+  // .jumbotron-text { flex-basis: 75%; }
+  .jumbotron-ks-ad { width: 220px; }
+  .jumbotron-text { width: 500px; }
 }

diff --git a/src/assets/less/site/responsive/screen-xs.less b/src/assets/less/site/responsive/screen-xs.less
index 156e5bc381167d10ed0a5ffae726be44c6a2870a..c41c0984fc26e01838b02ec465e0a8ec4bbee6c2 100644 (file)
--- a/src/assets/less/site/responsive/screen-xs.less
+++ b/src/assets/less/site/responsive/screen-xs.less
@@ -92,4 +92,12 @@
   .signup-button .btn { white-space: normal; }
   .v-get-started .get-started-cdn { padding: 5px 22px 22px 22px; }
 
+  #kickstarter-widget {
+    margin: 0 auto -40px;
+  }
+  .jumbotron-carousel {
+    #kickstarter-widget {
+      margin-top: 20px;
+    }
+  }
 }