From: Mark Otto <markotto@twitter.com>
Date: Fri, 23 Mar 2012 00:13:20 +0000 (-0700)
Subject: move navbarBrandColor closer to link color
X-Git-Tag: v2.0.3~5^2~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89ea238c32716aabe59dcab7d4e2480858bbba91;p=thirdparty%2Fbootstrap.git

move navbarBrandColor closer to link color
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a7b6950417..8fedb1f086 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/download.html b/docs/download.html
index 680e851f98..89ddd76a23 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -317,6 +317,8 @@
       <input type="text" class="span3" placeholder="@grayDark">
       <label>@navbarText</label>
       <input type="text" class="span3" placeholder="@grayLight">
+      <label>@navbarBrandColor</label>
+      <input type="text" class="span3" placeholder="@navbarLinkColor">
       <label>@navbarLinkColor</label>
       <input type="text" class="span3" placeholder="@grayLight">
       <label>@navbarLinkColorHover</label>
@@ -335,8 +337,6 @@
       <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
       <label>@navbarSearchPlaceholderColor</label>
       <input type="text" class="span3" placeholder="#ccc">
-      <label>@navbarBrandColor</label>
-      <input type="text" class="span3" placeholder="@navbarLinkColor">
 
       <h3>Dropdowns</h3>
       <label>@dropdownBackground</label>
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index c7f6cfab86..b282db6c94 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -241,6 +241,8 @@
       <input type="text" class="span3" placeholder="@grayDark">
       <label>@navbarText</label>
       <input type="text" class="span3" placeholder="@grayLight">
+      <label>@navbarBrandColor</label>
+      <input type="text" class="span3" placeholder="@navbarLinkColor">
       <label>@navbarLinkColor</label>
       <input type="text" class="span3" placeholder="@grayLight">
       <label>@navbarLinkColorHover</label>
@@ -259,8 +261,6 @@
       <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
       <label>@navbarSearchPlaceholderColor</label>
       <input type="text" class="span3" placeholder="#ccc">
-      <label>@navbarBrandColor</label>
-      <input type="text" class="span3" placeholder="@navbarLinkColor">
 
       <h3>{{_i}}Dropdowns{{/i}}</h3>
       <label>@dropdownBackground</label>