make it so that checkboxes and radio options-list can have wrapping labels; needs...

diff --git a/bootstrap.css b/bootstrap.css
index a7ba4c6492e42a166df18d9cc0d1a1de7cdc41f8..63f01b2ac2996cd66185fae66eaf685a5d057e01 100644 (file)
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Mon Oct  3 22:00:55 PDT 2011
+ * Date: Mon Oct  3 22:26:41 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -974,6 +974,7 @@ textarea[readonly] {
   float: none;
   width: auto;
   padding: 0;
+  margin-left: 20px;
   line-height: 18px;
   text-align: left;
   white-space: normal;
@@ -998,6 +999,8 @@ textarea[readonly] {
 }
 .inputs-list input[type=radio], .inputs-list input[type=checkbox] {
   margin-bottom: 0;
+  margin-left: -20px;
+  float: left;
 }
 .form-stacked {
   padding-left: 20px;

diff --git a/bootstrap.min.css b/bootstrap.min.css
index e9d26649cff6716e73e604adad9296fef72bf2da..a49985570167a3a71d3c8406e6fc2b42f5b0008a 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -167,12 +167,12 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
 .input-append input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 .input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;margin-right:0;margin-left:-1px;}
 .inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}
-.inputs-list label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list label strong{color:#808080;}
+.inputs-list label{display:block;float:none;width:auto;padding:0;margin-left:20px;line-height:18px;text-align:left;white-space:normal;}.inputs-list label strong{color:#808080;}
 .inputs-list label small{font-size:11px;font-weight:normal;}
 .inputs-list .inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
 .inputs-list:first-child{padding-top:6px;}
 .inputs-list li+li{padding-top:2px;}
-.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;}
+.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;margin-left:-20px;float:left;}
 .form-stacked{padding-left:20px;}.form-stacked fieldset{padding-top:9px;}
 .form-stacked legend{padding-left:0;}
 .form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}

diff --git a/docs/index.html b/docs/index.html
index c75ecc837b4c0c3812077ed439e5fd08e4b5cc2b..2b2d4f9d956675d6e605d84ae134347ffab21c3c 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -1107,7 +1107,7 @@
                 <li>
                   <label>
                     <input type="checkbox" name="optionsCheckboxes" value="option2" />
-                    <span>Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results</span>
+                    <span>Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results. Let's make it super long so that everyone can see how it wraps, too.</span>
                   </label>
                 </li>
                 <li>

diff --git a/lib/forms.less b/lib/forms.less
index 85e6e361e8bfc13453ad95cd41036ef0d3a58ef2..7c9cc7c62335ac5c12ce5d816a6d3dbd81275fa2 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -387,6 +387,7 @@ textarea[readonly] {
     float: none;
     width: auto;
     padding: 0;
+    margin-left: 20px;
     line-height: @baseline;
     text-align: left;
     white-space: normal;
@@ -412,6 +413,8 @@ textarea[readonly] {
   input[type=radio],
   input[type=checkbox] {
     margin-bottom: 0;
+    margin-left: -20px;
+    float: left;
   }
 }