diff options
| author | Mark Otto <[email protected]> | 2013-07-27 18:56:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-27 18:56:31 -0700 |
| commit | b281ad64096d919145159ffbc4e1a5b284708d9b (patch) | |
| tree | 66ae3741f34561082a1703c197db9c635266b96a /_includes | |
| parent | e953c23019ca8abd14e29eb03290ec6bbf5fedd9 (diff) | |
| download | bootstrap-b281ad64096d919145159ffbc4e1a5b284708d9b.tar.xz bootstrap-b281ad64096d919145159ffbc4e1a5b284708d9b.zip | |
Input groups overhaul
* Moves input groups CSS into separate file
* Moves input groups docs into the Components page
* Add support for radios and checkboxes in input groups to fix #8679
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/nav-components.html | 11 | ||||
| -rw-r--r-- | _includes/nav-css.html | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/_includes/nav-components.html b/_includes/nav-components.html index 514dcfed3..86bf4d070 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -26,6 +26,17 @@ </ul> </li> <li> + <a href="#input-groups">Input groups</a> + <ul class="nav"> + <li><a href="#input-groups-basic">Basic input group</a></li> + <li><a href="#input-groups-sizes">Sizing options</a></li> + <li><a href="#input-groups-checkboxes-radios">Checkbox and radios addons</a></li> + <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> + </ul> +</li> +<li> <a href="#nav">Navs</a> <ul class="nav"> <li><a href="#nav-tabs">Tabs nav</a></li> diff --git a/_includes/nav-css.html b/_includes/nav-css.html index fb00465c2..fc10a3037 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -57,7 +57,6 @@ <li><a href="#forms-horizontal">Horizontal variation</a></li> <li><a href="#forms-controls">Supported controls</a></li> <li><a href="#forms-control-states">Control states</a></li> - <li><a href="#forms-input-groups">Input groups</a></li> <li><a href="#forms-control-sizes">Control sizing</a></li> <li><a href="#forms-help-text">Help text</a></li> </ul> |