diff options
| author | Mark Otto <[email protected]> | 2013-12-18 11:41:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 11:41:48 -0800 |
| commit | 6315043b1c11c6391f155e0c7299783a13cfee74 (patch) | |
| tree | 3ba859890c893630a5b4098642d37fb0fb19b7d4 /components.html | |
| parent | b93d6dfbdf1f01e5e89764d846e1f68828c61c02 (diff) | |
| parent | d15218a09ce68d0854d0aa5f5170c1ea859aee31 (diff) | |
| download | bootstrap-6315043b1c11c6391f155e0c7299783a13cfee74.tar.xz bootstrap-6315043b1c11c6391f155e0c7299783a13cfee74.zip | |
Merge branch 'master' into docs_derp
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components.html b/components.html index 4bca679f9..660debeec 100644 --- a/components.html +++ b/components.html @@ -1372,7 +1372,7 @@ base_url: "../" <h2 id="navbar-forms">Forms</h2> <p>Place form content within <code>.navbar-form</code> for proper vertical alignment and collapsed behavior in narrow viewports. Use the alignment options to decide where it resides within the navbar content.</p> - <p>As a heads up, <code>.navbar-form</code> shares much of its code with <code>.form-inline</code> via mixin.</p> + <p>As a heads up, <code>.navbar-form</code> shares much of its code with <code>.form-inline</code> via mixin. <strong class="text-danger">Some form controls, like input groups, may require fixed widths to be show up properly within a navbar.</strong></p> <div class="bs-example"> <nav class="navbar navbar-default" role="navigation"> <div class="navbar-header"> |