Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

mdo · mdo · commit c8ab0a56c241 · 2015-08-23T23:16:18.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -24,6 +24,15 @@
   }
 }
 
+.dropup {
+  .dropdown-toggle {
+    &:after {
+      border-bottom: $caret-width solid;
+      border-top: 0;
+    }
+  }
+}
+
 // The dropdown menu (ul)
 .dropdown-menu {
   position: absolute;

Original file line number	Diff line number	Diff line change
`@@ -255,13 +255,13 @@ html {`
`255`	`255`
`256`	`256`	`@include media-breakpoint-up(md) {`
`257`	`257`	`html {`
`258`		`- font-size: 28px;`
	`258`	`+ font-size: 20px;`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`@include media-breakpoint-up(lg) {`
`263`	`263`	`html {`
`264`		`- font-size: 20px;`
	`264`	`+ font-size: 28px;`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`	`{% endhighlight %}`