diff options
| author | Mark Otto <[email protected]> | 2012-02-01 22:29:15 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-01 22:29:15 -0800 |
| commit | 43d797dfff839013deb726a55edf082378444640 (patch) | |
| tree | 97e62c4c90d54947f68468acde17c5535f605903 /docs | |
| parent | 4211f21e39631179753d6775e3ad90be05ab5f8f (diff) | |
| download | bootstrap-43d797dfff839013deb726a55edf082378444640.tar.xz bootstrap-43d797dfff839013deb726a55edf082378444640.zip | |
#1566: add note about removal of secondary-nav in 2.0
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56825 -> 56825 bytes | |||
| -rw-r--r-- | docs/templates/pages/upgrading.mustache | 1 | ||||
| -rw-r--r-- | docs/upgrading.html | 1 |
3 files changed, 2 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex c4ddd0f26..deab7e441 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache index 02d1c7feb..30b843e0d 100644 --- a/docs/templates/pages/upgrading.mustache +++ b/docs/templates/pages/upgrading.mustache @@ -119,6 +119,7 @@ <ul> <li>{{_i}}Base class changed from <code>.topbar</code> to <code>.navbar</code>{{/i}}</li> <li>{{_i}}Now supports static position (default behavior, not fixed) and fixed to the top of viewport via <code>.navbar-fixed-top</code> (previously only supported fixed){{/i}}</li> + <li>{{_i}}Removed the <code>.secondary-nav</code> class; instead, just use <code>.pull-right</code> for right-aligned nav{{/i}}</li> <li>{{_i}}Added vertical dividers to top-level nav{{/i}}</li> <li>{{_i}}Improved support for inline forms in the navbar, which now require <code>.navbar-form</code> to properly scope styles to only the intended forms.{{/i}}</li> <li>{{_i}}Navbar search form now requires use of the <code>.navbar-search</code> class and its input the use of <code>.search-query</code>. To position the search form, you <strong>must</strong> use <code>.pull-left</code> or <code>.pull-right</code>.{{/i}}</li> diff --git a/docs/upgrading.html b/docs/upgrading.html index 4d8328b7c..f3b18e4ed 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -195,6 +195,7 @@ <ul> <li>Base class changed from <code>.topbar</code> to <code>.navbar</code></li> <li>Now supports static position (default behavior, not fixed) and fixed to the top of viewport via <code>.navbar-fixed-top</code> (previously only supported fixed)</li> + <li>Removed the <code>.secondary-nav</code> class; instead, just use <code>.pull-right</code> for right-aligned nav</li> <li>Added vertical dividers to top-level nav</li> <li>Improved support for inline forms in the navbar, which now require <code>.navbar-form</code> to properly scope styles to only the intended forms.</li> <li>Navbar search form now requires use of the <code>.navbar-search</code> class and its input the use of <code>.search-query</code>. To position the search form, you <strong>must</strong> use <code>.pull-left</code> or <code>.pull-right</code>.</li> |