Fix
Merge pull request #7866 from marsuboss/patch-3

Fix
Fix caret position
Merge pull request #7872 from burnsra/3.0.0-wip-caret

Fix caret position
Fix glyphicon in "Dropdown in a button group" example
Merge pull request #7874 from burnsra/3.0.0-wip-form-examples

Fix glyphicon in "Dropdown in a button group" example
Cleanup form-inline examples in docs
.navbar docs: update -fixed-* callouts, fix -link

* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
add detail to navbar component alignment section

* The search form has been deprecated.
* Using pull-* on a list item won't have any effect.
Add .panel-footer
Fixes #7885 and #7886: only right align horizontal form labels when above 768px
Merge pull request #7882 from juthilo/3.0.0-wip

Cleaning the navbar docs
outdent the file list
refined navbar styles in docs
margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop)
Overhaul form control and button sizing, and some type styles

* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
Fixes #7878: .col-span-* mentions to .col-lg-*
Merge pull request #7877 from burnsra/3.0.0-wip-form-inline

Cleanup form-inline examples in docs
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
	docs/assets/css/docs.css
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip