Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update from official repo #3

Merged
merged 47 commits into from
Aug 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
27637cf
Remove the unneeded `d-block` from `.carousel-item`s. (#23472)
XhmikosR Aug 17, 2017
a77f515
Fix error in Alerts component doc (#23522)
Aug 17, 2017
58b54b6
Carousel - do not call next when the carousel or the parent isn't vis…
Johann-S Aug 17, 2017
d2bd8fb
Unit test to check if our carousel do not cycle when we cannot see it
Johann-S Aug 17, 2017
58994a1
Add a unit test to check if the carousel do not cycle when its parent…
Johann-S Aug 17, 2017
94cb75a
Update reboot.md (#23521)
XhmikosR Aug 18, 2017
74d9639
Update devDependencies and fix a typo in comment. (#23534)
XhmikosR Aug 18, 2017
f07d870
Remove `color` property from `badge` class
Aug 17, 2017
41bcab6
Fix favicons inclusion after e932345. (#23473)
XhmikosR Aug 18, 2017
d5db28d
Carousel prev/next controls are renamed accordingly (#23561)
jerone Aug 19, 2017
fd8c052
Restore grid offset classes
mdo Aug 15, 2017
f67805c
Update redirect.html
XhmikosR Aug 17, 2017
b5a2441
Changed Typography title to Text
simPod Aug 17, 2017
f822307
fixed package.json jspm section.
Aug 15, 2017
6fc9dde
equalize height of the first card of the card-group
gijsbotje Aug 16, 2017
c4b3d81
Drop the variables file table of contents and update the comment at t…
mdo Aug 20, 2017
1da730c
added @content directive to media-breakpoint-only mixin for min and m…
Aug 17, 2017
25bbfcd
dist
mdo Aug 20, 2017
2ba0127
fixes double border when .list-group.list-group-flush is preceded by …
gijsbotje Aug 15, 2017
bb32e91
added suggested fix for list-groups with a elements
gijsbotje Aug 16, 2017
834ee9b
Simplify selector and only override what we set
mdo Aug 20, 2017
c0434f6
Merge branch 'fix/badge-default-colors' of https://github.com/jonwols…
mdo Aug 20, 2017
26e6d8b
drop the now unused -color variable
mdo Aug 20, 2017
6bea2e2
dist
mdo Aug 20, 2017
22f6ee5
remove commented out code, fixes #23530
mdo Aug 20, 2017
d2973b3
remove mention of clearfix source from docs, closes #23578
mdo Aug 20, 2017
721d948
Remove trailing spaces (#23593)
joneff Aug 21, 2017
022b41e
Added missing dot (#23601)
skmedix Aug 21, 2017
bd3ca58
Rename grayscale function to gray
mdo Aug 20, 2017
6b6f45a
Exclude input type=range from touch-action:manipulation
patrickhlauke Aug 21, 2017
0759427
(#22414) Rename variables `$table-inverse-bg`, `$table-inverse-accent…
pat270 Aug 19, 2017
3bf3bdf
Rename `.table-inverse`, `.thead-inverse`, `.thead-default` to `.tabl…
pat270 Aug 19, 2017
5c95dcc
v4 docs Update Table docs with `.table-dark` and `.thead-light` changes
pat270 Aug 19, 2017
f7eb3c9
`.thead-dark` and `.thead-light` border color should display the righ…
pat270 Aug 19, 2017
f66fa3f
Generate series of `.table-responsive-*` classes to accomodate overf…
pat270 Jun 9, 2017
c1865b4
Add momentum scrolling on responsive tables for webkit touch devices
pat270 Jun 12, 2017
6ca451e
Add pointer-events declarations
patrickhlauke May 26, 2017
70ca04b
replaced basic line-heights variable with button's line-heights varia…
Aug 22, 2017
0492c3a
remove d-flex class from img tag in docs
chiraggmodi Aug 22, 2017
ef8c77d
Tweak ESLint rules.
XhmikosR Jul 27, 2017
6063b0d
Enable the `no-return-assign` rule.
Johann-S Jul 27, 2017
b72489a
Update which required jQuery release folks should use
Johann-S Aug 22, 2017
a416d32
Update Popper.js to 1.12.3
Johann-S Aug 22, 2017
3a6fc26
Use the Jekyll config variable for popper.min.js.
XhmikosR Aug 22, 2017
4571ab0
Fix toggle for Tooltips/Popover which was called even if the Tooltip/…
Johann-S Aug 24, 2017
5a90b4a
Collapse - preventDefault only on <a> elements not inside the collaps…
Johann-S Aug 25, 2017
ba6a6f1
Fix sticky margin when a modal is opened (#23669)
TechDavid Aug 25, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ cdn:
js_hash: "sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1"
jquery: "https://code.jquery.com/jquery-3.2.1.slim.min.js"
jquery_hash: "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"
popper_hash: "sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"
popper_hash: "sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh"
2 changes: 2 additions & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
{% endif %}
<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">

{% include favicons.html %}

{% include social.html %}

<script>
Expand Down
5 changes: 3 additions & 2 deletions _layouts/redirect.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!DOCTYPE html>
<html lang="en-US">
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Bootstrap - Content moved</title>
<link rel="canonical" href="{{ page.redirect.to }}">
<meta http-equiv="refresh" content="0; url={{ page.redirect.to }}">
Expand Down Expand Up @@ -31,6 +32,6 @@
<body>
<h1>Redirecting…</h1>
<a href="{{ page.redirect.to }}">Click here if you are not redirected</a>
<script>location="{{ page.redirect.to }}"</script>
<script>window.location="{{ page.redirect.to }}";</script>
</body>
</html>
2 changes: 1 addition & 1 deletion assets/css/docs.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/ie-emulation-modes-warning.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// IE JavaScript conditional compilation docs: https://msdn.microsoft.com/library/121hztk3%28v=vs.94%29.aspx
// @cc_on docs: https://msdn.microsoft.com/library/8ka90k2e%28v=vs.94%29.aspx
var jscriptVersion = new Function('/*@cc_on return @_jscript_version; @*/')() // eslint-disable-line no-new-func
if (jscriptVersion === undefined) {
if (typeof jscriptVersion === 'undefined') {
return 11 // IE11+ not in emulation mode
}
if (jscriptVersion < 9) {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/vendor/popper.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"Gruntfile.js"
],
"dependencies": {
"jquery": ">=1.9.1",
"popper.js": "^1.11.0"
"jquery": ">=3.0.0",
"popper.js": "^1.12.3"
}
}
4 changes: 2 additions & 2 deletions build/stamp.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ if (typeof jQuery === 'undefined') {

(function ($) {
var version = $.fn.jquery.split(' ')[0].split('.')
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 4)) {
throw new Error('Bootstrap\\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
if ((version[0] < 3) || (version[0] >= 4)) {
throw new Error('Bootstrap\\'s JavaScript requires at least jQuery v3.0.0 but less than v4.0.0')
}
})(jQuery);

Expand Down
188 changes: 188 additions & 0 deletions dist/css/bootstrap-grid.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-reboot.css.map

Large diffs are not rendered by default.

Loading