kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Fixes #8732: unfucks disabled fieldset form example with form groups

This commit is contained in:
Mark Otto 2013-08-05 14:45:00 -07:00
parent bfe76273a0
commit 844df9e001
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
css.html
View File

@ -1550,12 +1550,18 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<p>While Bootstrap will apply these styles in all browsers, Internet Explorer 9 and below don't actually support the <code>disabled</code> attribute on a <code>&lt;fieldset&gt;</code>. Use custom JavaScript to disable the fieldset in these browsers.</p> <p>While Bootstrap will apply these styles in all browsers, Internet Explorer 9 and below don't actually support the <code>disabled</code> attribute on a <code>&lt;fieldset&gt;</code>. Use custom JavaScript to disable the fieldset in these browsers.</p>
</div> </div>
<form class="bs-example form-inline"> <form class="bs-example">
<fieldset disabled> <fieldset disabled>
<input type="text" class="form-control" placeholder="Disabled input"> <div class="form-group">
<select class="form-control"> <label for="disabledInput">Disabled input</label>
<option>Disabled select</option> <input type="text" id="disabledInput" class="form-control" placeholder="Disabled input">
</select> </div>
<div class="form-group">
<label for="disabledInput">Disabled select menu</label>
<select id="disabledSelect" class="form-control">
<option>Disabled select</option>
</select>
</div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox"> Can't check this <input type="checkbox"> Can't check this
@ -1567,10 +1573,16 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{% highlight html %} {% highlight html %}
<form class="form-inline"> <form class="form-inline">
<fieldset disabled> <fieldset disabled>
<input type="text" class="form-control" placeholder="Disabled input"> <div class="form-group">
<select class="form-control"> <label for="disabledInput">Disabled input</label>
<option>Disabled select</option> <input type="text" id="disabledInput" class="form-control" placeholder="Disabled input">
</select> </div>
<div class="form-group">
<label for="disabledInput">Disabled select menu</label>
<select id="disabledSelect" class="form-control">
<option>Disabled select</option>
</select>
</div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox"> Can't check this <input type="checkbox"> Can't check this

1
dist/css/bootstrap.css vendored
View File

@ -2874,7 +2874,6 @@ button.close {
.nav-collapse-scrollable { .nav-collapse-scrollable {
max-height: 360px; max-height: 360px;
margin-bottom: 15px; margin-bottom: 15px;
overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
less/navbar.less
View File

@ -106,7 +106,6 @@
margin-bottom: @navbar-padding-vertical; margin-bottom: @navbar-padding-vertical;
max-height: 360px; max-height: 360px;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
} }