diff options
| author | Mark Otto <[email protected]> | 2015-06-18 23:56:43 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-06-18 23:56:43 -0700 |
| commit | 169d2a4a78776ddaa4fec774691a3c5f03aa3eda (patch) | |
| tree | 997248da2a627a3ef3478dd0f8f8077267c56e22 /docs/components/input-group.md | |
| parent | df2ca92d7704d54a15be54e5da8086712bd18680 (diff) | |
| parent | 1e64692716985246f70c89bcf8d5119e17a353c0 (diff) | |
| download | bootstrap-169d2a4a78776ddaa4fec774691a3c5f03aa3eda.tar.xz bootstrap-169d2a4a78776ddaa4fec774691a3c5f03aa3eda.zip | |
Merge branch 'master' into v4
Diffstat (limited to 'docs/components/input-group.md')
| -rw-r--r-- | docs/components/input-group.md | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/docs/components/input-group.md b/docs/components/input-group.md index 3c933b862..da5dcd954 100644 --- a/docs/components/input-group.md +++ b/docs/components/input-group.md @@ -110,12 +110,14 @@ Buttons in input groups are a bit different and require one extra level of nesti <div class="col-lg-6"> <div class="input-group"> <div class="input-group-btn"> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Action</button> - <ul class="dropdown-menu" role="menu"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + Action + </button> + <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> - <li class="divider"></li> + <li role="separator" class="divider"></li> <li><a href="#">Separated link</a></li> </ul> </div> @@ -126,12 +128,14 @@ Buttons in input groups are a bit different and require one extra level of nesti <div class="input-group"> <input type="text" class="form-control" aria-label="Text input with dropdown button"> <div class="input-group-btn"> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Action</button> - <ul class="dropdown-menu dropdown-menu-right" role="menu"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + Action + </button> + <ul class="dropdown-menu dropdown-menu-right"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> - <li class="divider"></li> + <li role="separator" class="divider"></li> <li><a href="#">Separated link</a></li> </ul> </div> @@ -148,14 +152,14 @@ Buttons in input groups are a bit different and require one extra level of nesti <div class="input-group"> <div class="input-group-btn"> <button type="button" class="btn btn-secondary">Action</button> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <span class="sr-only">Toggle Dropdown</span> </button> - <ul class="dropdown-menu" role="menu"> + <ul class="dropdown-menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> - <li class="divider"></li> + <li role="separator" class="divider"></li> <li><a href="#">Separated link</a></li> </ul> </div> @@ -167,14 +171,14 @@ Buttons in input groups are a bit different and require one extra level of nesti <input type="text" class="form-control" aria-label="Text input with segmented button dropdown"> <div class="input-group-btn"> <button type="button" class="btn btn-secondary">Action</button> - <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <span class="sr-only">Toggle Dropdown</span> </button> - <ul class="dropdown-menu dropdown-menu-right" role="menu"> + <ul class="dropdown-menu dropdown-menu-right"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> - <li class="divider"></li> + <li role="separator" class="divider"></li> <li><a href="#">Separated link</a></li> </ul> </div> |