diff --git a/.travis.yml b/.travis.yml
index 66060dfff7..ca932e99f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,10 @@ install:
- bundle install --deployment --jobs=1
- cp grunt/npm-shrinkwrap.json ./
- npm install
+# Undo `_JAVA_OPTIONS` environment variable;
+# see https://github.com/travis-ci/travis-ci/issues/8408
+before_script:
+ - _JAVA_OPTIONS=
cache:
directories:
- node_modules
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 13be35f1e6..acde27cf0b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -157,13 +157,12 @@ project (indentation, accurate comments, etc.) and any other requirements
**Do not edit `bootstrap.css`, `bootstrap-theme.css`, or `bootstrap.js`
directly!** Those files are automatically generated. You should edit the
-source files in [`/bootstrap/less/`](https://github.com/twbs/bootstrap/tree/master/less),
-[`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/v4-dev/scss) (for Bootstrap v4),
-and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead.
+source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/v4-dev/scss)
+and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/v4-dev/js) instead.
Similarly, when contributing to Bootstrap's documentation, you should edit the
documentation source files in
-[the `/bootstrap/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/docs).
+[the `/bootstrap/docs/4.0` directory of the `v4-dev` branch](https://github.com/twbs/bootstrap/tree/v4-dev/docs/4.0).
**Do not edit the `gh-pages` branch.** That branch is generated from the
documentation source files and is managed separately by the Bootstrap Core Team.
@@ -185,8 +184,8 @@ included in the project:
2. If you cloned a while ago, get the latest changes from upstream:
```bash
- git checkout master
- git pull upstream master
+ git checkout v4-dev
+ git pull upstream v4-dev
```
3. Create a new topic branch (off the main project development branch) to
@@ -205,7 +204,7 @@ included in the project:
5. Locally merge (or rebase) the upstream development branch into your topic branch:
```bash
- git pull [--rebase] upstream master
+ git pull [--rebase] upstream v4-dev
```
6. Push your topic branch up to your fork:
@@ -215,7 +214,7 @@ included in the project:
```
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
- with a clear title and description against the `master` branch.
+ with a clear title and description against the `v4-dev` branch.
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
license your work under the terms of the [MIT License](LICENSE) (if it
diff --git a/Gemfile.lock b/Gemfile.lock
index 471b0eabc8..dbbace5b23 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,8 +3,8 @@ GEM
specs:
addressable (2.4.0)
colorator (0.1)
- ffi (1.9.14)
- ffi (1.9.14-x64-mingw32)
+ ffi (1.9.18)
+ ffi (1.9.18-x64-mingw32)
jekyll (3.1.6)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
@@ -14,24 +14,28 @@ GEM
mercenary (~> 0.3.3)
rouge (~> 1.7)
safe_yaml (~> 1.0)
- jekyll-sass-converter (1.4.0)
+ jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-sitemap (0.11.0)
addressable (~> 2.4.0)
- jekyll-watch (1.4.0)
+ jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
- kramdown (1.11.1)
+ kramdown (1.14.0)
liquid (3.0.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
mercenary (0.3.6)
- rb-fsevent (0.9.7)
- rb-inotify (0.9.7)
- ffi (>= 0.5.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
rouge (1.11.1)
safe_yaml (1.0.4)
- sass (3.4.22)
+ sass (3.5.1)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
PLATFORMS
ruby
@@ -42,4 +46,4 @@ DEPENDENCIES
jekyll-sitemap (~> 0.11.0)
BUNDLED WITH
- 1.15.1
+ 1.15.3
diff --git a/_config.yml b/_config.yml
index c62ac5c763..2b60da81b4 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,6 +10,7 @@ source: docs
destination: _gh_pages
host: 0.0.0.0
port: 3001
+baseurl: ""
url: http://getbootstrap.com
baseurl: /docs/3.4
encoding: UTF-8
@@ -19,6 +20,7 @@ gems:
# Custom vars
current_version: 3.4.0
+docs_version: 3.4
repo: https://github.com/twbs/bootstrap
sass_repo: https://github.com/twbs/bootstrap-sass
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 3b4a026de5..6acc4a9f1e 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -6,8 +6,8 @@
Designed and built with all the love in the world by @mdo and @fat. Maintained by the core team with the help of our contributors.
diff --git a/js/carousel.js b/js/carousel.js
index ea9486f49a..bf780fb2c1 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -144,7 +144,9 @@
var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
if ($.support.transition && this.$element.hasClass('slide')) {
$next.addClass(type)
- $next[0].offsetWidth // force reflow
+ if (typeof $next === 'object' && $next.length) {
+ $next[0].offsetWidth // force reflow
+ }
$active.addClass(direction)
$next.addClass(direction)
$active