mirror of
https://github.com/twbs/bootstrap.git
synced 2025-06-15 00:02:10 -04:00
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
This commit is contained in:
commit
c8ab0a56c2
1
Gemfile
1
Gemfile
@ -8,4 +8,5 @@ group :development, :test do
|
|||||||
gem 'rouge', '~> 1.7.4'
|
gem 'rouge', '~> 1.7.4'
|
||||||
gem 'sass', '~> 3.4.9'
|
gem 'sass', '~> 3.4.9'
|
||||||
gem 'scss-lint', '~> 0.31'
|
gem 'scss-lint', '~> 0.31'
|
||||||
|
gem 'jekyll-redirect-from', '~> 0.8.0'
|
||||||
end
|
end
|
||||||
|
@ -255,13 +255,13 @@ html {
|
|||||||
|
|
||||||
@include media-breakpoint-up(md) {
|
@include media-breakpoint-up(md) {
|
||||||
html {
|
html {
|
||||||
font-size: 28px;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@include media-breakpoint-up(lg) {
|
@include media-breakpoint-up(lg) {
|
||||||
html {
|
html {
|
||||||
font-size: 20px;
|
font-size: 28px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
{% endhighlight %}
|
{% endhighlight %}
|
||||||
|
@ -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.
|
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
|
### Carousel
|
||||||
|
|
||||||
- Renamed `.item` to `.carousel-item`.
|
- Renamed `.item` to `.carousel-item`.
|
||||||
|
@ -24,6 +24,15 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropup {
|
||||||
|
.dropdown-toggle {
|
||||||
|
&:after {
|
||||||
|
border-bottom: $caret-width solid;
|
||||||
|
border-top: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// The dropdown menu (ul)
|
// The dropdown menu (ul)
|
||||||
.dropdown-menu {
|
.dropdown-menu {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user