diff options
| author | Mark Otto <[email protected]> | 2015-08-23 23:16:18 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-23 23:16:18 -0700 |
| commit | c8ab0a56c24136aa4beb9f5e76b4548dd5c33df8 (patch) | |
| tree | 5f12f9d72321b4d8470c3fc91b67ffa8a78980d4 /docs | |
| parent | 7d194a9bd34394406ff44cef90f43c94849d6939 (diff) | |
| parent | e27e9d863b8b655b76628094b73d28a9df9ff421 (diff) | |
| download | bootstrap-c8ab0a56c24136aa4beb9f5e76b4548dd5c33df8.tar.xz bootstrap-c8ab0a56c24136aa4beb9f5e76b4548dd5c33df8.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/content/typography.md | 4 | ||||
| -rw-r--r-- | docs/migration.md | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/docs/content/typography.md b/docs/content/typography.md index 3145209ee..264686b05 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -255,13 +255,13 @@ html { @include media-breakpoint-up(md) { html { - font-size: 28px; + font-size: 20px; } } @include media-breakpoint-up(lg) { html { - font-size: 20px; + font-size: 28px; } } {% endhighlight %} diff --git a/docs/migration.md b/docs/migration.md index d1c58c94f..6141a67f5 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -98,6 +98,20 @@ New to Bootstrap 4 is the Reboot, a new stylesheet that builds on Normalize with Dropped entirely for the new card component. +#### Panels + +- `.panel` to `.card` +- `.panel-default` removed and no replacement +- `.panel-heading` to `.card-header` +- `.panel-title` to `.card-title` +- `.panel-body` to `.card-block` +- `.panel-footer` to `.card-footer` +- `.panel-primary` to `.card-primary` and `.card-inverse` +- `.panel-success` to `.card-success` and `.card-inverse` +- `.panel-info` to `.card-info` and `.card-inverse` +- `.panel-warning` to `.card-warning` and `.card-inverse` +- `.panel-danger` to `.card-danger` and `.card-inverse` + ### Carousel - Renamed `.item` to `.carousel-item`. |