diff options
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/components/button-dropdowns.html | 8 | ||||
| -rw-r--r-- | docs/_includes/components/button-groups.html | 2 | ||||
| -rw-r--r-- | docs/_includes/components/input-groups.html | 4 | ||||
| -rw-r--r-- | docs/_includes/components/navbar.html | 4 | ||||
| -rw-r--r-- | docs/_includes/components/navs.html | 4 | ||||
| -rw-r--r-- | docs/_includes/css/forms.html | 27 |
6 files changed, 37 insertions, 12 deletions
diff --git a/docs/_includes/components/button-dropdowns.html b/docs/_includes/components/button-dropdowns.html index d4ae0450f..165e0777e 100644 --- a/docs/_includes/components/button-dropdowns.html +++ b/docs/_includes/components/button-dropdowns.html @@ -246,7 +246,7 @@ <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown"> Large button <span class="caret"></span> </button> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> ... </ul> </div> @@ -256,7 +256,7 @@ <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"> Small button <span class="caret"></span> </button> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> ... </ul> </div> @@ -266,7 +266,7 @@ <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown"> Extra small button <span class="caret"></span> </button> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> ... </ul> </div> @@ -313,7 +313,7 @@ <span class="caret"></span> <span class="sr-only">Toggle Dropdown</span> </button> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> <!-- Dropdown menu links --> </ul> </div> diff --git a/docs/_includes/components/button-groups.html b/docs/_includes/components/button-groups.html index b2f700528..16463ee33 100644 --- a/docs/_includes/components/button-groups.html +++ b/docs/_includes/components/button-groups.html @@ -121,7 +121,7 @@ Dropdown <span class="caret"></span> </button> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> <li><a href="#">Dropdown link</a></li> <li><a href="#">Dropdown link</a></li> </ul> diff --git a/docs/_includes/components/input-groups.html b/docs/_includes/components/input-groups.html index e7ea9c064..4cfddad08 100644 --- a/docs/_includes/components/input-groups.html +++ b/docs/_includes/components/input-groups.html @@ -221,7 +221,7 @@ <div class="input-group"> <div class="input-group-btn"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> @@ -237,7 +237,7 @@ <input type="text" class="form-control"> <div class="input-group-btn"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> - <ul class="dropdown-menu dropdown-menu-right"> + <ul class="dropdown-menu dropdown-menu-right" role="menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html index 02f4fbcfa..cdcfbf634 100644 --- a/docs/_includes/components/navbar.html +++ b/docs/_includes/components/navbar.html @@ -98,7 +98,7 @@ <li><a href="#">Link</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> @@ -119,7 +119,7 @@ <li><a href="#">Link</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html index d9c45fa2d..26cae463d 100644 --- a/docs/_includes/components/navs.html +++ b/docs/_includes/components/navs.html @@ -137,7 +137,7 @@ <a class="dropdown-toggle" data-toggle="dropdown" href="#"> Dropdown <span class="caret"></span> </a> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> ... </ul> </li> @@ -171,7 +171,7 @@ <a class="dropdown-toggle" data-toggle="dropdown" href="#"> Dropdown <span class="caret"></span> </a> - <ul class="dropdown-menu"> + <ul class="dropdown-menu" role="menu"> ... </ul> </li> diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index f2e29d6ff..95bb29c59 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -207,7 +207,8 @@ {% endhighlight %} <h3>Checkboxes and radios</h3> - <p>Checkboxes are for selecting one or several options in a list while radios are for selecting one option from many.</p> + <p>Checkboxes are for selecting one or several options in a list, while radios are for selecting one option from many.</p> + <p>A checkbox or radio with the <code>disabled</code> attribute will be styled appropriately. To have the <code><label></code> for the checkbox or radio also display a "not-allowed" cursor when the user hovers over the label, add the <code>.disabled</code> class to your <code>.radio</code>, <code>.radio-inline</code>, <code>.checkbox</code>, <code>.checkbox-inline</code>, or <code><fieldset></code>.</p> <h4>Default (stacked)</h4> <div class="bs-example"> <form role="form"> @@ -217,6 +218,12 @@ Option one is this and that—be sure to include why it's great </label> </div> + <div class="checkbox disabled"> + <label> + <input type="checkbox" value="" disabled> + Option two is disabled + </label> + </div> <br> <div class="radio"> <label> @@ -230,6 +237,12 @@ Option two can be something else and selecting it will deselect option one </label> </div> + <div class="radio disabled"> + <label> + <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled> + Option three is disabled + </label> + </div> </form> </div><!-- /.bs-example --> {% highlight html %} @@ -239,6 +252,12 @@ Option one is this and that—be sure to include why it's great </label> </div> +<div class="checkbox disabled"> + <label> + <input type="checkbox" value="" disabled> + Option two is disabled + </label> +</div> <div class="radio"> <label> @@ -252,6 +271,12 @@ Option two can be something else and selecting it will deselect option one </label> </div> +<div class="radio disabled"> + <label> + <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled> + Option three is disabled + </label> +</div> {% endhighlight %} <h4>Inline checkboxes and radios</h4> |