Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
c8ab0a56
Commit
c8ab0a56
authored
9 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch 'v4-dev' of
https://github.com/twbs/bootstrap
into v4-dev
parents
7d194a9b
e27e9d86
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Gemfile
+1
-0
Gemfile
docs/content/typography.md
+2
-2
docs/content/typography.md
docs/migration.md
+14
-0
docs/migration.md
scss/_dropdown.scss
+9
-0
scss/_dropdown.scss
with
26 additions
and
2 deletions
+26
-2
Gemfile
+
1
-
0
View file @
c8ab0a56
...
@@ -8,4 +8,5 @@ group :development, :test do
...
@@ -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
This diff is collapsed.
Click to expand it.
docs/content/typography.md
+
2
-
2
View file @
c8ab0a56
...
@@ -255,13 +255,13 @@ html {
...
@@ -255,13 +255,13 @@ html {
@include media-breakpoint-up(md) {
@include media-breakpoint-up(md) {
html {
html {
font-size: 2
8
px;
font-size: 2
0
px;
}
}
}
}
@include media-breakpoint-up(lg) {
@include media-breakpoint-up(lg) {
html {
html {
font-size: 2
0
px;
font-size: 2
8
px;
}
}
}
}
{% endhighlight %}
{% endhighlight %}
This diff is collapsed.
Click to expand it.
docs/migration.md
+
14
-
0
View file @
c8ab0a56
...
@@ -98,6 +98,20 @@ New to Bootstrap 4 is the Reboot, a new stylesheet that builds on Normalize with
...
@@ -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`
.
...
...
This diff is collapsed.
Click to expand it.
scss/_dropdown.scss
+
9
-
0
View file @
c8ab0a56
...
@@ -24,6 +24,15 @@
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment