diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /docs/migration.html | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'docs/migration.html')
| -rw-r--r-- | docs/migration.html | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/migration.html b/docs/migration.html index ff856140d..5a1e1a012 100644 --- a/docs/migration.html +++ b/docs/migration.html @@ -42,6 +42,10 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m <td><code>.navbar-brand</code></td> </tr> <tr> + <td><code>.navbar .nav</code></td> + <td><code>.navbar-nav</code></td> + </tr> + <tr> <td><code>.nav-collapse</code></td> <td><code>.navbar-collapse</code></td> </tr> @@ -410,6 +414,11 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m <td><code>.help-inline</code></td> <td>No exact equivalent, but <code>.help-block</code> is similar.</td> </tr> + <tr> + <td>Non-bar-level progress colors</td> + <td><code>.progress-info</code> <code>.progress-success</code> <code>.progress-warning</code> <code>.progress-danger</code></td> + <td>Use <code>.progress-bar-*</code> on the <code>.progress-bar</code> instead.</td> + </tr> </tbody> </table> </div><!-- /.table-responsive --> |