diff --git a/Gemfile b/Gemfile index 23068bdfeb..cc3e50b7f4 100644 --- a/Gemfile +++ b/Gemfile @@ -8,4 +8,5 @@ group :development, :test do gem 'rouge', '~> 1.7.4' gem 'sass', '~> 3.4.9' gem 'scss-lint', '~> 0.31' + gem 'jekyll-redirect-from', '~> 0.8.0' end diff --git a/docs/content/typography.md b/docs/content/typography.md index 3145209ee8..264686b054 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 d1c58c94f3..6141a67f50 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`. diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index b1a7f5c440..3b0df96d86 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -24,6 +24,15 @@ } } +.dropup { + .dropdown-toggle { + &:after { + border-bottom: $caret-width solid; + border-top: 0; + } + } +} + // The dropdown menu (ul) .dropdown-menu { position: absolute;