rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Code Issues Actions Packages Releases Activity

make it so that checkboxes and radio options-list can have wrapping labels; needs to be cross browser tested yet

Browse Source
This commit is contained in:
Mark Otto 2011-10-03 22:27:15 -07:00
parent a968d300b4
commit c843e202b5
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 /* 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). * 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; float: none;
width: auto; width: auto;
padding: 0; padding: 0;
margin-left: 20px;
line-height: 18px; line-height: 18px;
text-align: left; text-align: left;
white-space: normal; white-space: normal;
@ -998,6 +999,8 @@ textarea[readonly] {
} }
.inputs-list input[type=radio], .inputs-list input[type=checkbox] { .inputs-list input[type=radio], .inputs-list input[type=checkbox] {
margin-bottom: 0; margin-bottom: 0;
margin-left: -20px;
float: left;
} }
.form-stacked { .form-stacked {
padding-left: 20px; padding-left: 20px;

4
bootstrap.min.css vendored
View File

@ -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 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;} .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{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 label small{font-size:11px;font-weight:normal;}
.inputs-list .inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} .inputs-list .inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
.inputs-list:first-child{padding-top:6px;} .inputs-list:first-child{padding-top:6px;}
.inputs-list li+li{padding-top:2px;} .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{padding-left:20px;}.form-stacked fieldset{padding-top:9px;}
.form-stacked legend{padding-left:0;} .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;} .form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}

2
docs/index.html
View File

@ -1107,7 +1107,7 @@
<li> <li>
<label> <label>
<input type="checkbox" name="optionsCheckboxes" value="option2" /> <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> </label>
</li> </li>
<li> <li>

3
lib/forms.less
View File

@ -387,6 +387,7 @@ textarea[readonly] {
float: none; float: none;
width: auto; width: auto;
padding: 0; padding: 0;
margin-left: 20px;
line-height: @baseline; line-height: @baseline;
text-align: left; text-align: left;
white-space: normal; white-space: normal;
@ -412,6 +413,8 @@ textarea[readonly] {
input[type=radio], input[type=radio],
input[type=checkbox] { input[type=checkbox] {
margin-bottom: 0; margin-bottom: 0;
margin-left: -20px;
float: left;
} }
} }