From: Chris Rebert <code@rebertia.com>
Date: Tue, 28 Oct 2014 18:10:51 +0000 (-0700)
Subject: Merge branch 'master' into jonschlinkert/master
X-Git-Tag: v3.3.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=223d9b4b6b5518dcf498ac31497f2e63bce95259;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into jonschlinkert/master
---

223d9b4b6b5518dcf498ac31497f2e63bce95259
diff --cc docs/_includes/customizer-variables.html
index e3e3dab395,cd98145139..89edc603de
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@@ -295,9 -312,9 +312,9 @@@
    </div>
  </div>
  <h2 id="buttons">Buttons</h2>
 -<p>For each of Bootstrap&#39;s buttons, define text, background and border color.</p>
 +<p>For each of Bootstrap's buttons, define text, background and border color.</p>
  <div class="row">
-   <div class="bs-customizer-input">
+   <div class="col-xs-4">
      <label for="input-@btn-font-weight">@btn-font-weight</label>
      <input id="input-@btn-font-weight" type="text" value="normal" data-var="@btn-font-weight" class="form-control"/>
    </div>