final tweaks to docs

build/_includes/examples/new.html

@@ -1,4 +1,4 @@
-<div id="new-styles">
+<{% if page.navbar_active == "examples" %}div{% else %}section{% endif %} id="new-styles">
   <h2 class="page-header">New Styles in {{ site.font_awesome.version }}</h2>
   <div class="row">
     <div class="span4">
@@ -44,4 +44,4 @@
       </div>
     </div>
   </div>
-</div>
+</{% if page.navbar_active == "examples" %}div{% else %}section{% endif %}>

build/_includes/jumbotron-slider.html

@@ -18,7 +18,7 @@
                onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);">
               GitHub Project</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
             Version {{ site.font_awesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-            Created &amp; Maintained by Dave Gandy
+            Created &amp; Maintained by <a href="http://twitter.com/{{ site.font_awesome.author.twitter }}">Dave Gandy</a>
           </div>
         </div>
       </div>

build/_includes/license.html

@@ -50,6 +50,7 @@
 <section>
   <h2 class="page-header">Brand Icons</h2>
   <ul>
-    <li>All brand icons are copyrighted or trademarked by their respective owners.</li>
+    <li>All brand icons are trademarks of their respective owners.</li>
+    <li>The use of these trademarks does not indicate endorsement of the trademark holder by Font Awesome, nor vice versa.</li>
   </ul>
 </section>

build/_includes/stripe-social.html

@@ -8,10 +8,10 @@
         <iframe class="github-btn" src="http://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/fortaweso_me" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @fortaweso_me</a>
+        <a href="https://twitter.com/{{ site.font_awesome.twitter }}" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @{{ site.font_awesome.twitter }}</a>
       </li>
       <li class="tweet-btn">
-        <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.font_awesome.url }}" data-text="#FontAwesome, the iconic font designed for Bootstrap" data-counturl="{{ site.font_awesome.legacy_url }}" data-count="horizontal" data-via="fortaweso_me" data-related="byscuits:Creator of Font Awesome">Tweet</a>
+        <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.font_awesome.url }}" data-text="#FontAwesome, the iconic font designed for Bootstrap" data-counturl="{{ site.font_awesome.legacy_url }}" data-count="horizontal" data-via="{{ site.font_awesome.twitter }}" data-related="{{ site.font_awesome.author.twitter }}:Creator of Font Awesome">Tweet</a>
       </li>
     </ul>
 

build/_includes/whats-new.html

@@ -26,7 +26,7 @@
     </div>
   </div>
   <div class="row">
-    <div class="span4">
+    <div class="span4 margin-bottom-large">
       <h4><i class="icon-magic"></i> Pixel Perfection at 14px</h4>
       Version 3.0 was re-created from the ground up to be razor sharp at Bootstrap's default 14px.
     </div>

build/assets/css/site.css

@@ -5723,45 +5723,11 @@ h6 {
   margin-top: 10px;
   margin-right: 30px;
 }
-.btn-github {
+.btn-primary {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #e7e7e7;
-  background-image: -moz-linear-gradient(top, #ffffff, #c4c4c4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#c4c4c4));
-  background-image: -webkit-linear-gradient(top, #ffffff, #c4c4c4);
-  background-image: -o-linear-gradient(top, #ffffff, #c4c4c4);
-  background-image: linear-gradient(to bottom, #ffffff, #c4c4c4);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffc4c4c4', GradientType=0);
-  border-color: #c4c4c4 #c4c4c4 #9d9d9d;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #c4c4c4;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.btn-github:hover,
-.btn-github:focus,
-.btn-github:active,
-.btn-github.active,
-.btn-github.disabled,
-.btn-github[disabled] {
-  color: #ffffff;
-  background-color: #c4c4c4;
-  *background-color: #b7b7b7;
-}
-.btn-github:active,
-.btn-github.active {
-  background-color: #aaaaaa \9;
-}
-.btn-primary,
-.btn-github {
   color: #333333;
   text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25);
 }
-.btn-primary:hover,
+.btn-primary:hover {
-.btn-github:hover {
   text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25);
   color: #333333;
 }
@@ -5782,15 +5748,12 @@ section {
   font-weight: bold;
   padding: 0px 5px;
   line-height: 17px;
+  margin: 0;
 }
 #social-buttons .count.btn {
   background: #ffffff;
   font-weight: normal;
 }
-#social-buttons .watch,
-#social-buttons .fork {
-  margin-right: 30px;
-}
 .the-icons {
   list-style-type: none;
   margin: 0;

build/assets/js/site.js

@@ -14,6 +14,7 @@ $(function() {
 //    e.preventDefault();
 //    e.stopPropagation();
 //  });
+
 //  // inject twitter & github counts
 //  $.ajax({
 //    url: 'http://api.twitter.com/1/users/show.json',

build/assets/less/site.less

@@ -179,11 +179,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
   }
 }
 
-.btn-github {
+.btn-primary {
-  .buttonBackground(@white, mix(@grayLighter, @grayLight, 50%));
-}
-
-.btn-primary, .btn-github {
   color: @grayDark;
   text-shadow: 0 -1px 0 rgba(255,255,255,.25);
   &:hover {
@@ -192,9 +188,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
   }
 }
 
-section {
+section { margin-top: 40px; }
-  margin-top: 40px;
-}
 
 #social-buttons {
   ul.unstyled { margin: 0; }
@@ -210,13 +204,14 @@ section {
 //    font-size: @baseFontSize;
     padding: 0px 5px;
     line-height: @baseLineHeight - 3;
+    margin: 0;
   }
   .count.btn {
     background: @white;
     font-weight: normal;
   }
   .watch, .fork {
-    margin-right: 30px;
+//    margin-right: 30px;
   }
 }
 

build/whats-new/index.html

@@ -12,5 +12,6 @@ relative_path: ../
 
 <div class="container">
   {% include whats-new.html %}
+  {% include examples/new.html %}
   {% include icons/new.html %}
 </div>