From: Mark Otto <markotto@twitter.com>
Date: Fri, 23 Mar 2012 04:17:55 +0000 (-0700)
Subject: remove labels and badges from customizer and replace with single file
X-Git-Tag: v2.0.3~5^2~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdf8a6966be7d2b2e62ea1860501fbdf59ef671d;p=thirdparty%2Fbootstrap.git

remove labels and badges from customizer and replace with single file
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 4cdd3a0cde..613eef56b9 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 65ef15d00b..b22478e14b 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -107,8 +107,7 @@
       <h3>Base CSS</h3>
       <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> Labels</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="badges.less"> Badges</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> Labels and badges</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label>
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index dfc96fdc3e..cec420f3e5 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -31,8 +31,7 @@
       <h3>{{_i}}Base CSS{{/i}}</h3>
       <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> {{_i}}Headings, body, etc{{/i}}</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> {{_i}}Code and pre{{/i}}</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> {{_i}}Labels{{/i}}</label>
-      <label class="checkbox"><input checked="checked" type="checkbox" value="badges.less"> {{_i}}Badges{{/i}}</label>
+      <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> {{_i}}Labels and badges{{/i}}</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> {{_i}}Tables{{/i}}</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> {{_i}}Forms{{/i}}</label>
       <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> {{_i}}Buttons{{/i}}</label>