Skip to content

Commit 81c578b

Browse files
committed
Merge branch 'v4-dev' into modal_input_autofocus_keyboard_focus
* v4-dev: (34 commits) tests: use jQuery from node_modules. (twbs#28059) Fix `js-main` script. (twbs#28057) Make progress animation respect `$enable-transitions` and `prefers-reduced-motion` media query Examples: add tabindex="-1" and aria-disabled="true" on disabled links Clean up .gitignore. (twbs#28050) Fix Carousel's touch option to not add touch listeners when set to false (twbs#28046) Remove map-merge (twbs#28033) Cleanup popover arrows (twbs#28008) Sync dropdown font size to base font size Sync dropdown font size with btn font size Remove background from nested tables Add some margin below the buttons Fix background size y Minify background property Combine background properties into one Prevent useless property rendering Don't render a background by default Prevent rendering of color property by default Change comment heading title to `Typography` (twbs#28032) Align toast variables (twbs#28041) ... # Conflicts: # package.json
2 parents 79d6d90 + 3aeda99 commit 81c578b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+532
-379
lines changed

.gitignore

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# Ignore docs files
2-
_gh_pages
3-
_site
4-
site/docs/**/dist/
2+
/_gh_pages/
3+
/site/.jekyll-metadata
4+
/site/docs/**/dist/
55

6-
# Ignore ruby files
7-
.ruby-version
8-
.bundle
9-
vendor/cache
10-
vendor/bundle
6+
# Ignore ruby/bundler files
7+
/.bundle/
8+
/vendor/
9+
/.ruby-version
1110

1211
# Numerous always-ignore extensions
1312
*.diff
@@ -39,9 +38,6 @@ Thumbs.db
3938
.komodotools
4039
*.komodoproject
4140

42-
# Jekyll metadata
43-
docs/.jekyll-metadata
44-
4541
# Folders to ignore
46-
node_modules
47-
js/coverage
42+
/js/coverage/
43+
/node_modules/

.stylelintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"extends": [
3-
"stylelint-config-bootstrap/scss"
3+
"stylelint-config-twbs-bootstrap/scss"
44
]
55
}

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2011-2018 Twitter, Inc.
4-
Copyright (c) 2011-2018 The Bootstrap Authors
3+
Copyright (c) 2011-2019 Twitter, Inc.
4+
Copyright (c) 2011-2019 The Bootstrap Authors
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,4 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
210210

211211
## Copyright and license
212212

213-
Code and documentation copyright 2011-2018 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
213+
Code and documentation copyright 2011-2019 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).

build/build-plugins.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Script to build our plugins to use them separately.
3-
* Copyright 2018 The Bootstrap Authors
4-
* Copyright 2018 Twitter, Inc.
3+
* Copyright 2019 The Bootstrap Authors
4+
* Copyright 2019 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
66
*/
77

build/change-version.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
/*!
44
* Script to update version number references in the project.
5-
* Copyright 2017-2018 The Bootstrap Authors
6-
* Copyright 2017-2018 Twitter, Inc.
5+
* Copyright 2017-2019 The Bootstrap Authors
6+
* Copyright 2017-2019 Twitter, Inc.
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
*/
99

build/generate-sri.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* Remember to use the same vendor files as the CDN ones,
66
* otherwise the hashes won't match!
77
*
8-
* Copyright 2017-2018 The Bootstrap Authors
9-
* Copyright 2017-2018 Twitter, Inc.
8+
* Copyright 2017-2019 The Bootstrap Authors
9+
* Copyright 2017-2019 Twitter, Inc.
1010
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
1111
*/
1212

build/vnu-jar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
/*!
44
* Script to run vnu-jar if Java is available.
5-
* Copyright 2017-2018 The Bootstrap Authors
6-
* Copyright 2017-2018 Twitter, Inc.
5+
* Copyright 2017-2019 The Bootstrap Authors
6+
* Copyright 2017-2019 Twitter, Inc.
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
88
*/
99

dist/css/bootstrap-grid.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)