From 3fe7253c635a12c7807b479748039acbc2e5ed5f Mon Sep 17 00:00:00 2001
From: davegandy <dave@davegandy.com>
Date: Sat, 19 Oct 2013 14:37:08 -0400
Subject: [PATCH] changing component base color (love bootstrap ease) and
 updating the navbar

---
 src/_includes/navbar.html                     |  3 +--
 src/assets/less/site/bootstrap/variables.less | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html
index e57aeafa3..50cfb6a41 100644
--- a/src/_includes/navbar.html
+++ b/src/_includes/navbar.html
@@ -22,7 +22,7 @@
           <ul class="dropdown-menu pull-right">
             <li><a href="{{ page.relative_path }}icons/"><i class="fa-icon fa-icon-flag fa-icon-fixed-width"></i>&nbsp; Icons</a></li>
             <li class="divider"></li>
-            <li><a href="{{ page.relative_path }}icons/#new"><i class="fa-icon fa-icon-shield fa-icon-fixed-width"></i>&nbsp; New Icons in {{ site.fontawesome.version }}</a></li>
+            <li><a href="{{ page.relative_path }}icons/#new"><i class="fa-icon fa-icon-rub fa-icon-fixed-width"></i>&nbsp; New Icons in {{ site.fontawesome.minor_version }}</a></li>
             <li><a href="{{ page.relative_path }}icons/#web-application"><i class="fa-icon fa-icon-camera-retro fa-icon-fixed-width"></i>&nbsp; Web Application Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#currency"><i class="fa-icon fa-icon-won fa-icon-fixed-width"></i>&nbsp; Currency Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#text-editor"><i class="fa-icon fa-icon-file-text-alt fa-icon-fixed-width"></i>&nbsp; Text Editor Icons</a></li>
@@ -40,7 +40,6 @@
           <ul class="dropdown-menu pull-right">
             <li><a href="{{ page.relative_path }}examples/">Examples</a></li>
             <li class="divider"></li>
-            <li><a href="{{ page.relative_path }}examples/#new-styles">New Styles</a></li>
             <li><a href="{{ page.relative_path }}examples/#inline-icons">Inline Icons</a></li>
             <li><a href="{{ page.relative_path }}examples/#larger-icons">Larger Icons</a></li>
             <li><a href="{{ page.relative_path }}examples/#bordered-pulled">Bordered & Pulled</a></li>
diff --git a/src/assets/less/site/bootstrap/variables.less b/src/assets/less/site/bootstrap/variables.less
index e77dda8a7..07efc8cd3 100644
--- a/src/assets/less/site/bootstrap/variables.less
+++ b/src/assets/less/site/bootstrap/variables.less
@@ -121,11 +121,12 @@
 //@brand-danger:          @red;
 //@brand-info:            @blue;
 
-// Pills
-@nav-pills-active-link-hover-bg: @link-color;
+
+// Components
+@component-active-bg:            @jumbotron-bg;
 
 // Carousel
-@carousel-text-shadow:                        0 1px 0 rgba(255,255,255,0.25);
+@carousel-text-shadow:                      0 1px 0 rgba(255,255,255,0.25);
 
-@carousel-control-color:                      @jumbotron-bg-dark;
-@carousel-control-font-size:                  30px;
+@carousel-control-color:                    @jumbotron-bg-dark;
+@carousel-control-font-size:                30px;