adding lazy.less because i'm lazy, moving ads out of the way on topic pages

build/_includes/examples.html

@@ -1,6 +1,19 @@
 <section id="examples">
-<h3 class="page-header">Many examples appreciatively re-used from the <a href="{{ site.bootstrap.url }}">Bootstrap documentation</a>.</h3>
 <div class="row">
+  <div class="span8">
+    <h2 class="page-header">Examples</h2>
+    <p>
+      After you get <a href="{{ site.baseurl }}integration/">up and running</a>, you can place Font Awesome icons just about anywhere with the <code>&lt;i&gt;</code> tag.
+      Many examples appreciatively re-used from the <a href="{{ site.bootstrap.url }}">Bootstrap documentation</a>.
+    </p>
+  </div>
+  <div class="span4">
+    <br>
+    {% include ads/carbon-light-horizontal.html %}
+  </div>
+</div>
+
+<div class="row margin-top-large">
   <div class="span4">
     <div class="well well-transparent">
       <p>Use Font Awesome icons in:</p>

build/_includes/icons/new.html

@@ -1,49 +1,65 @@
-<section id="icons-new" class="row">
-  <div class="span12">
-    <h2 class="page-header">New Icons in {{ site.font-awesome.version }}</h2>
-    <p>
-      You asked, Font Awesome delivers with 40 shiny new icons in version {{ site.font-awesome.version }}. New icons can be requested on the
-      <a href="https://github.com/FortAwesome/Font-Awesome" target="_blank">Font Awesome GitHub project</a>. Or even
-      better, you can <a href="#contribute">contribute your own icons</a>.
-    </p>
+<section id="icons-new">
+  {% if page.navbar_active == "icons" %}
+  <div class="row">
+    <div class="span8">
+      <h2 class="page-header">New Icons in {{ site.font-awesome.version }}</h2>
+      <p>
+        You asked, Font Awesome delivers with 40 shiny new icons in version {{ site.font-awesome.version }}. New icons can be requested on the
+        <a href="https://github.com/FortAwesome/Font-Awesome" target="_blank">Font Awesome GitHub project</a>.
+      </p>
+    </div>
+    <div class="span4">
+      <br>
+      {% include ads/carbon-light-horizontal.html %}
+    </div>
   </div>
+  {% else %}
+  <h2 class="page-header">New Icons in {{ site.font-awesome.version }}</h2>
+  <p>
+    You asked, Font Awesome delivers with 40 shiny new icons in version {{ site.font-awesome.version }}. New icons can be requested on the
+    <a href="https://github.com/FortAwesome/Font-Awesome" target="_blank">Font Awesome GitHub project</a>. Or even
+    better, you can <a href="#contribute">contribute your own icons</a>.
+  </p>
+  {% endif %}
 
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ site.baseurl }}icon/smile"><i class="icon-smile"></i> icon-smile</a></li>
-      <li><a href="{{ site.baseurl }}icon/frown"><i class="icon-frown"></i> icon-frown</a></li>
-      <li><a href="{{ site.baseurl }}icon/meh"><i class="icon-meh"></i> icon-meh</a></li>
-      <li><a href="{{ site.baseurl }}icon/gamepad"><i class="icon-gamepad"></i> icon-gamepad</a></li>
-      <li><a href="{{ site.baseurl }}icon/keyboard"><i class="icon-keyboard"></i> icon-keyboard</a></li>
-      <li><a href="{{ site.baseurl }}icon/flag-alt"><i class="icon-flag-alt"></i> icon-flag-alt</a></li>
-      <li><a href="{{ site.baseurl }}icon/flag-checkered"><i class="icon-flag-checkered"></i> icon-flag-checkered</a></li>
-      <li><a href="{{ site.baseurl }}icon/terminal"><i class="icon-terminal"></i> icon-terminal</a></li>
-      <li><a href="{{ site.baseurl }}icon/code"><i class="icon-code"></i> icon-code</a></li>
-      <li><a href="{{ site.baseurl }}icon/share-alt"><i class="icon-mail-forward"></i> icon-mail-forward <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ site.baseurl }}icon/reply"><i class="icon-mail-reply"></i> icon-mail-reply <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ site.baseurl }}icon/reply-all"><i class="icon-reply-all"></i> icon-reply-all</a></li>
-      <li><a href="{{ site.baseurl }}icon/reply-all"><i class="icon-mail-reply-all"></i> icon-mail-reply-all <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ site.baseurl }}icon/star-half-empty"><i class="icon-star-half-empty"></i> icon-star-half-empty</a></li>
-      <li><a href="{{ site.baseurl }}icon/location-arrow"><i class="icon-location-arrow"></i> icon-location-arrow</a></li>
-      <li><a href="{{ site.baseurl }}icon/undo"><i class="icon-rotate-left"></i> icon-rotate-left <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ site.baseurl }}icon/repeat"><i class="icon-rotate-right"></i> icon-rotate-right <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ site.baseurl }}icon/crop"><i class="icon-crop"></i> icon-crop</a></li>
-      <li><a href="{{ site.baseurl }}icon/code-fork"><i class="icon-code-fork"></i> icon-code-fork</a></li>
-      <li><a href="{{ site.baseurl }}icon/unlink"><i class="icon-unlink"></i> icon-unlink</a></li>
-      <li><a href="{{ site.baseurl }}icon/question"><i class="icon-question"></i> icon-question</a></li>
-      <li><a href="{{ site.baseurl }}icon/info"><i class="icon-info"></i> icon-info</a></li>
-      <li><a href="{{ site.baseurl }}icon/exclamation"><i class="icon-exclamation"></i> icon-exclamation</a></li>
-      <li><a href="{{ site.baseurl }}icon/superscript"><i class="icon-superscript"></i> icon-superscript</a></li>
-      <li><a href="{{ site.baseurl }}icon/subscript"><i class="icon-subscript"></i> icon-subscript</a></li>
-      <li><a href="{{ site.baseurl }}icon/eraser"><i class="icon-eraser"></i> icon-eraser</a></li>
-      <li><a href="{{ site.baseurl }}icon/puzzle-piece"><i class="icon-puzzle-piece"></i> icon-puzzle-piece</a></li>
-      <li><a href="{{ site.baseurl }}icon/microphone"><i class="icon-microphone"></i> icon-microphone</a></li>
-      <li><a href="{{ site.baseurl }}icon/microphone-off"><i class="icon-microphone-off"></i> icon-microphone-off</a></li>
-      <li><a href="{{ site.baseurl }}icon/shield"><i class="icon-shield"></i> icon-shield</a></li>
-      <li><a href="{{ site.baseurl }}icon/calendar-empty"><i class="icon-calendar-empty"></i> icon-calendar-empty</a></li>
-      <li><a href="{{ site.baseurl }}icon/fire-extinguisher"><i class="icon-fire-extinguisher"></i> icon-fire-extinguisher</a></li>
-      <li><a href="{{ site.baseurl }}icon/rocket"><i class="icon-rocket"></i> icon-rocket</a></li>
-      <li><a href="{{ site.baseurl }}icon/maxcdn"><i class="icon-maxcdn"></i> icon-maxcdn</a></li>
-    </ul>
+  <div class="row">
+    <div class="span3">
+      <ul class="the-icons">
+        <li><a href="{{ site.baseurl }}icon/smile"><i class="icon-smile"></i> icon-smile</a></li>
+        <li><a href="{{ site.baseurl }}icon/frown"><i class="icon-frown"></i> icon-frown</a></li>
+        <li><a href="{{ site.baseurl }}icon/meh"><i class="icon-meh"></i> icon-meh</a></li>
+        <li><a href="{{ site.baseurl }}icon/gamepad"><i class="icon-gamepad"></i> icon-gamepad</a></li>
+        <li><a href="{{ site.baseurl }}icon/keyboard"><i class="icon-keyboard"></i> icon-keyboard</a></li>
+        <li><a href="{{ site.baseurl }}icon/flag-alt"><i class="icon-flag-alt"></i> icon-flag-alt</a></li>
+        <li><a href="{{ site.baseurl }}icon/flag-checkered"><i class="icon-flag-checkered"></i> icon-flag-checkered</a></li>
+        <li><a href="{{ site.baseurl }}icon/terminal"><i class="icon-terminal"></i> icon-terminal</a></li>
+        <li><a href="{{ site.baseurl }}icon/code"><i class="icon-code"></i> icon-code</a></li>
+        <li><a href="{{ site.baseurl }}icon/share-alt"><i class="icon-mail-forward"></i> icon-mail-forward <span class="muted">(alias)</span></a></li>
+        <li><a href="{{ site.baseurl }}icon/reply"><i class="icon-mail-reply"></i> icon-mail-reply <span class="muted">(alias)</span></a></li>
+        <li><a href="{{ site.baseurl }}icon/reply-all"><i class="icon-reply-all"></i> icon-reply-all</a></li>
+        <li><a href="{{ site.baseurl }}icon/reply-all"><i class="icon-mail-reply-all"></i> icon-mail-reply-all <span class="muted">(alias)</span></a></li>
+        <li><a href="{{ site.baseurl }}icon/star-half-empty"><i class="icon-star-half-empty"></i> icon-star-half-empty</a></li>
+        <li><a href="{{ site.baseurl }}icon/location-arrow"><i class="icon-location-arrow"></i> icon-location-arrow</a></li>
+        <li><a href="{{ site.baseurl }}icon/undo"><i class="icon-rotate-left"></i> icon-rotate-left <span class="muted">(alias)</span></a></li>
+        <li><a href="{{ site.baseurl }}icon/repeat"><i class="icon-rotate-right"></i> icon-rotate-right <span class="muted">(alias)</span></a></li>
+        <li><a href="{{ site.baseurl }}icon/crop"><i class="icon-crop"></i> icon-crop</a></li>
+        <li><a href="{{ site.baseurl }}icon/code-fork"><i class="icon-code-fork"></i> icon-code-fork</a></li>
+        <li><a href="{{ site.baseurl }}icon/unlink"><i class="icon-unlink"></i> icon-unlink</a></li>
+        <li><a href="{{ site.baseurl }}icon/question"><i class="icon-question"></i> icon-question</a></li>
+        <li><a href="{{ site.baseurl }}icon/info"><i class="icon-info"></i> icon-info</a></li>
+        <li><a href="{{ site.baseurl }}icon/exclamation"><i class="icon-exclamation"></i> icon-exclamation</a></li>
+        <li><a href="{{ site.baseurl }}icon/superscript"><i class="icon-superscript"></i> icon-superscript</a></li>
+        <li><a href="{{ site.baseurl }}icon/subscript"><i class="icon-subscript"></i> icon-subscript</a></li>
+        <li><a href="{{ site.baseurl }}icon/eraser"><i class="icon-eraser"></i> icon-eraser</a></li>
+        <li><a href="{{ site.baseurl }}icon/puzzle-piece"><i class="icon-puzzle-piece"></i> icon-puzzle-piece</a></li>
+        <li><a href="{{ site.baseurl }}icon/microphone"><i class="icon-microphone"></i> icon-microphone</a></li>
+        <li><a href="{{ site.baseurl }}icon/microphone-off"><i class="icon-microphone-off"></i> icon-microphone-off</a></li>
+        <li><a href="{{ site.baseurl }}icon/shield"><i class="icon-shield"></i> icon-shield</a></li>
+        <li><a href="{{ site.baseurl }}icon/calendar-empty"><i class="icon-calendar-empty"></i> icon-calendar-empty</a></li>
+        <li><a href="{{ site.baseurl }}icon/fire-extinguisher"><i class="icon-fire-extinguisher"></i> icon-fire-extinguisher</a></li>
+        <li><a href="{{ site.baseurl }}icon/rocket"><i class="icon-rocket"></i> icon-rocket</a></li>
+        <li><a href="{{ site.baseurl }}icon/maxcdn"><i class="icon-maxcdn"></i> icon-maxcdn</a></li>
+      </ul>
+    </div>
   </div>
 </section>

build/_includes/integration.html

@@ -1,6 +1,15 @@
 <section id="integration">
-  <h2 class="page-header">Integration</h2>
-  <p>It's easy to integrate Font Awesome into Twitter Bootstrap, or even use it on its own.</p>
+  <div class="row margin-bottom">
+    <div class="span8">
+      <h2 class="page-header">Integration</h2>
+      <p>It's easy to get started with Font Awesome. And it plays really nicely with <a href="{{ site.bootstrap.url }}">Bootstrap</a>.</p>
+    </div>
+    <div class="span4">
+      <br>
+      {% include ads/carbon-light-horizontal.html %}
+    </div>
+  </div>
+
   <div class="row">
     <div class="span12">
       <h4>Easy Bootstrap + Font Awesome Integration</h4>

build/_includes/jumbotron.html

@@ -1,6 +1,5 @@
 <div class="jumbotron jumbotron-ad">
   <div class="container">
-    <div class="pull-right">{% include ads/carbon-dark-vertical.html %}</div>
     <h1>{{ jumbotron_h1 }}</h1>
     <p>{{ jumbotron_p }}</p>
   </div>

build/_includes/roadmap.html

@@ -1,8 +1,15 @@
 <section id="roadmap">
-  <p>Here's the plan for future updates.</p>
-  <ul class="icons">
-    <li><i class="icon-plus"></i>Easier sub-setting with icon packs.</li>
-    <li><i class="icon-plus"></i>More icons. Have any requests? <a href="https://github.com/FortAwesome/Font-Awesome/issues" target="_blank">Open an issue</a> in the Font Awesome GitHub project.</li>
-    <li><i class="icon-plus"></i>Tricks and tips for super-awesome creative CSS methods, like the star example above.</li>
-  </ul>
+  <div class="row margin-bottom">
+    <div class="span8">
+      <p>Here's the plan for future updates.</p>
+      <ul class="icons">
+        <li><i class="icon-plus"></i>Easier sub-setting with icon packs.</li>
+        <li><i class="icon-plus"></i>More icons. Have any requests? <a href="https://github.com/FortAwesome/Font-Awesome/issues" target="_blank">Open an issue</a> in the Font Awesome GitHub project.</li>
+        <li><i class="icon-plus"></i>Tricks and tips for super-awesome creative CSS methods, like the star example above.</li>
+      </ul>
+    </div>
+    <div class="span4">
+      {% include ads/carbon-light-horizontal.html %}
+    </div>
+  </div>
 </section>

build/_includes/whats-new.html

@@ -1,4 +1,19 @@
 <section id="whats-new">
+  <div class="row">
+    <div class="span8">
+      <h2 class="page-header">New Features</h2>
+      <p>
+        We're always making Font Awesome a little awesome-er. Have some ideas for new features? Head on over to the
+        <a href="{{ site.font-awesome.github.url }}">Font Awesome GitHub project</a>.
+      </p>
+    </div>
+    <div class="span4">
+      <br>
+      {% include ads/carbon-light-horizontal.html %}
+    </div>
+  </div>
+
+
   <div class="row">
     <div class="span4">
       <h4><i class="icon-magic"></i> Pixel Perfection at 14px</h4>

build/assets/css/site.css

@@ -5276,6 +5276,187 @@ body {
   height: 110px;
   padding: 30px 0 30px;
 }
+.padding-none {
+  padding: 0 !important;
+}
+.padding {
+  padding: 10px !important;
+}
+.padding-small {
+  padding: 5px !important;
+}
+.padding-large {
+  padding: 22px !important;
+}
+.padding-top-none {
+  padding-top: 0 !important;
+}
+.padding-top {
+  padding-top: 10px !important;
+}
+.padding-top-small {
+  padding-top: 5px !important;
+}
+.padding-top-large {
+  padding-top: 22px !important;
+}
+.padding-right-none {
+  padding-right: 0 !important;
+}
+.padding-right {
+  padding-right: 10px !important;
+}
+.padding-right-small {
+  padding-right: 5px !important;
+}
+.padding-right-large {
+  padding-right: 22px !important;
+}
+.padding-bottom-none {
+  padding-bottom: 0 !important;
+}
+.padding-bottom {
+  padding-bottom: 10px !important;
+}
+.padding-bottom-small {
+  padding-bottom: 5px !important;
+}
+.padding-bottom-large {
+  padding-bottom: 22px !important;
+}
+.padding-left-none {
+  padding-left: 0 !important;
+}
+.padding-left {
+  padding-left: 10px !important;
+}
+.padding-left-small {
+  padding-left: 5px !important;
+}
+.padding-left-large {
+  padding-left: 22px !important;
+}
+.margin-none {
+  margin: 0 !important;
+}
+.margin {
+  margin: 10px !important;
+}
+.margin-small {
+  margin: 5px !important;
+}
+.margin-large {
+  margin: 22px !important;
+}
+.margin-top-none {
+  margin-top: 0 !important;
+}
+.margin-top {
+  margin-top: 10px !important;
+}
+.margin-top-large {
+  margin-top: 22px !important;
+}
+.margin-top-small {
+  margin-top: 5px !important;
+}
+.margin-right-none {
+  margin-right: 0 !important;
+}
+.margin-right {
+  margin-right: 10px !important;
+}
+.margin-right-large {
+  margin-right: 22px !important;
+}
+.margin-right-small {
+  margin-right: 5px !important;
+}
+.margin-bottom-none {
+  margin-bottom: 0 !important;
+}
+.margin-bottom {
+  margin-bottom: 10px !important;
+}
+.margin-bottom-large {
+  margin-bottom: 22px !important;
+}
+.margin-bottom-small {
+  margin-bottom: 5px !important;
+}
+.margin-left-none {
+  margin-left: 0 !important;
+}
+.margin-left {
+  margin-left: 10px !important;
+}
+.margin-left-large {
+  margin-left: 22px !important;
+}
+.margin-left-small {
+  margin-left: 5px !important;
+}
+.border-left-none {
+  border-left: none !important;
+}
+.border-right-none {
+  border-right: none !important;
+}
+.border-bottom-none {
+  border-bottom: none !important;
+}
+.border-top-none {
+  border-top: none !important;
+}
+.display-block {
+  display: block;
+}
+.no-underline:hover {
+  text-decoration: none;
+}
+.clickable {
+  cursor: pointer;
+}
+.strong {
+  font-weight: bold;
+}
+.em {
+  font-style: italic;
+}
+.small {
+  font-size: 85%;
+}
+.no-link {
+  color: #333333;
+}
+.text-sans-serif {
+  font-family: proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.text-ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.text-default {
+  font-family: proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  font-weight: normal;
+}
+.hilite {
+  color: #c83025;
+}
+.hilite:hover {
+  color: #9d261d;
+  text-decoration: underline;
+}
+.hilite [class^="icon-"]:before,
+.hilite [class*=" icon-"]:before {
+  display: inline;
+}
+.strike {
+  text-decoration: line-through;
+}
 .navbar .brand {
   font-family: museo-slab, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }

build/assets/less/lazy.less

@@ -0,0 +1,83 @@
+.padding-none         { padding: 0 !important; }
+.padding              { padding: 10px !important; }
+.padding-small        { padding: 5px !important; }
+.padding-large        { padding: 22px !important; }
+
+.padding-top-none     { padding-top: 0 !important; }
+.padding-top          { padding-top: 10px !important; }
+.padding-top-small    { padding-top: 5px !important; }
+.padding-top-large    { padding-top: 22px !important; }
+
+.padding-right-none   { padding-right: 0 !important; }
+.padding-right        { padding-right: 10px !important; }
+.padding-right-small  { padding-right: 5px !important; }
+.padding-right-large  { padding-right: 22px !important; }
+
+.padding-bottom-none  { padding-bottom: 0 !important; }
+.padding-bottom       { padding-bottom: 10px !important; }
+.padding-bottom-small { padding-bottom: 5px !important; }
+.padding-bottom-large { padding-bottom: 22px !important; }
+
+.padding-left-none    { padding-left: 0 !important; }
+.padding-left         { padding-left: 10px !important; }
+.padding-left-small   { padding-left: 5px !important; }
+.padding-left-large   { padding-left: 22px !important; }
+
+.margin-none          { margin: 0 !important; }
+.margin               { margin: 10px !important; }
+.margin-small         { margin: 5px !important; }
+.margin-large         { margin: 22px !important; }
+
+.margin-top-none      { margin-top: 0 !important; }
+.margin-top           { margin-top: 10px !important; }
+.margin-top-large     { margin-top: 22px !important; }
+.margin-top-small     { margin-top: 5px !important; }
+
+.margin-right-none    { margin-right: 0 !important; }
+.margin-right         { margin-right: 10px !important; }
+.margin-right-large   { margin-right: 22px !important; }
+.margin-right-small   { margin-right: 5px !important; }
+
+.margin-bottom-none   { margin-bottom: 0 !important; }
+.margin-bottom        { margin-bottom: 10px !important; }
+.margin-bottom-large  { margin-bottom: 22px !important; }
+.margin-bottom-small  { margin-bottom: 5px !important; }
+
+.margin-left-none     { margin-left: 0 !important; }
+.margin-left          { margin-left: 10px !important; }
+.margin-left-large    { margin-left: 22px !important; }
+.margin-left-small    { margin-left: 5px !important; }
+
+.border-left-none     { border-left: none !important; }
+.border-right-none    { border-right: none !important; }
+.border-bottom-none   { border-bottom: none !important; }
+.border-top-none      { border-top: none !important; }
+
+.display-block { display: block; } // use to swap an anchor tag to span a whole row to make click target larger
+.no-underline:hover { text-decoration: none; }
+.clickable { cursor: pointer; }
+.strong { font-weight: bold; }
+.em { font-style: italic; }
+.small { font-size: 85%; } // Ex: 14px base font * 85% = about 12px
+.no-link { color: @grayDark; }
+.text-sans-serif { font-family: @sansFontFamily; }
+.text-ellipsis { .text-overflow(); } // truncates text to a single line with an ellipsis at the end
+.text-default {
+  font-family: @sansFontFamily;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  font-weight: normal;
+}
+.hilite {
+  color: @linkColor;
+  &:hover {
+    color: @linkColorHover;
+    text-decoration: underline;
+  }
+  [class^="icon-"], [class*=" icon-"] {
+    &:before {
+      display: inline;
+    }
+  }
+}
+.strike { text-decoration: line-through; }

build/assets/less/site.less

@@ -3,6 +3,7 @@
 
 @import "mixins.less";
 @import "variables.less";
+@import "lazy.less";
 
 .navbar .brand {
 //  padding: 11px 20px 9px;