root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

change form fields back to inline-block to allow for inline-help text in default form markup

This commit is contained in:
Mark Otto 2012-01-25 11:26:45 -08:00
parent d3c5dd4e6a
commit b851156863
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap.css vendored
View File

@ -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: Wed Jan 25 11:21:22 PST 2012
* Date: Wed Jan 25 11:24:56 PST 2012
*/
article,
aside,
@ -497,7 +497,7 @@ input,
textarea,
select,
.uneditable-input {
display: block;
display: inline-block;
width: 210px;
height: 18px;
padding: 4px;

2
bootstrap.min.css vendored
View File

@ -94,7 +94,7 @@ fieldset{padding:0;margin:0;border:0;}
legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
label{display:block;margin-bottom:5px;color:#333333;}
input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
.uneditable-textarea{width:auto;height:auto;}
input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}

2
docs/base-css.html
View File

@ -899,7 +899,7 @@
<div class="span9">
<form class="well">
<label>Label name</label>
<input type="text" class="span3" placeholder="Type something…">
<input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span>
<label class="checkbox">
<input type="checkbox"> Check me out
</label>

2
docs/templates/pages/base-css.mustache vendored
View File

@ -835,7 +835,7 @@
<div class="span9">
<form class="well">
<label>{{_i}}Label name{{/i}}</label>
<input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}">
<input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"> <span class="help-inline">Associated help text!</span>
<label class="checkbox">
<input type="checkbox"> {{_i}}Check me out{{/i}}
</label>

2
lib/forms.less
View File

@ -52,7 +52,7 @@ input,
textarea,
select,
.uneditable-input {
display: block;
display: inline-block;
width: 210px;
height: @baseLineHeight;
padding: 4px;