rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append

Browse Source
This commit is contained in:
Mark Otto 2012-03-22 17:36:32 -07:00
parent ceab161324
commit b7b84c7a0d
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

1
docs/assets/css/bootstrap.css vendored
View File

@ -992,6 +992,7 @@ select:focus:required:invalid:focus {
.input-append select, .input-append select,
.input-prepend .uneditable-input, .input-prepend .uneditable-input,
.input-append .uneditable-input { .input-append .uneditable-input {
margin-bottom: 0;
*margin-left: 0; *margin-left: 0;
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;

3
docs/base-css.html
View File

@ -1639,8 +1639,7 @@ For example, <code>section</code> should be wrapped as inline.
<label class="control-label" for="inputIcon">Email address</label> <label class="control-label" for="inputIcon">Email address</label>
<div class="controls"> <div class="controls">
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on"><i class="icon-envelope"></i></span> <span class="add-on"><i class="icon-envelope"></i></span><input class="span2" id="inputIcon" type="text">
<input class="span2" id="inputIcon" type="text">
</div> </div>
</div> </div>
</div> </div>

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

@ -1563,8 +1563,7 @@
<label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label> <label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label>
<div class="controls"> <div class="controls">
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on"><i class="icon-envelope"></i></span> <span class="add-on"><i class="icon-envelope"></i></span><input class="span2" id="inputIcon" type="text">
<input class="span2" id="inputIcon" type="text">
</div> </div>
</div> </div>
</div> </div>

1
less/forms.less
View File

@ -365,6 +365,7 @@ select:focus:required:invalid {
input, input,
select, select,
.uneditable-input { .uneditable-input {
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
*margin-left: 0; *margin-left: 0;
.border-radius(0 3px 3px 0); .border-radius(0 3px 3px 0);
&:focus { &:focus {