diff options
| author | Mark Otto <[email protected]> | 2015-08-04 20:08:10 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-04 20:08:10 -0700 |
| commit | 39d9bc9ceaace1dcceadd1302aee25f468f5aa35 (patch) | |
| tree | 531793f0b25a2314a0710cb42e59102a8c47b57b /docs/_includes/nav | |
| parent | 709a077c368f4cd6563ec7f4f3f8e80b4b584a78 (diff) | |
| parent | 10cc97cdd9bf609e4245def20e701408ecb5d580 (diff) | |
| download | bootstrap-39d9bc9ceaace1dcceadd1302aee25f468f5aa35.tar.xz bootstrap-39d9bc9ceaace1dcceadd1302aee25f468f5aa35.zip | |
Merge branch 'master' of https://github.com/twbs/bootstrap
Diffstat (limited to 'docs/_includes/nav')
| -rw-r--r-- | docs/_includes/nav/components.html | 1 | ||||
| -rw-r--r-- | docs/_includes/nav/css.html | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/_includes/nav/components.html b/docs/_includes/nav/components.html index 1ec91b563..66b9ac0a0 100644 --- a/docs/_includes/nav/components.html +++ b/docs/_includes/nav/components.html @@ -45,6 +45,7 @@ <li><a href="#input-groups-buttons">Button addons</a></li> <li><a href="#input-groups-buttons-dropdowns">Buttons with dropdowns</a></li> <li><a href="#input-groups-buttons-segmented">Segmented buttons</a></li> + <li><a href="#input-groups-buttons-multiple">Multiple buttons</a></li> </ul> </li> <li> diff --git a/docs/_includes/nav/css.html b/docs/_includes/nav/css.html index 02becfe68..59134bdfc 100644 --- a/docs/_includes/nav/css.html +++ b/docs/_includes/nav/css.html @@ -73,9 +73,9 @@ <li><a href="#forms-control-focus">Focus state</a></li> <li><a href="#forms-control-disabled">Disabled state</a></li> <li><a href="#forms-control-readonly">Readonly state</a></li> + <li><a href="#forms-help-text">Help text</a></li> <li><a href="#forms-control-validation">Validation states</a></li> <li><a href="#forms-control-sizes">Control sizing</a></li> - <li><a href="#forms-help-text">Help text</a></li> </ul> </li> <li> |