From 5f06a8ebd6387dee8b07016620020644999e1412 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Thu, 22 Sep 2016 11:03:03 +0100 Subject: [PATCH 1/6] Port d71c7c09588dd432bb4ca31bd93b677c10d892c2 to v3 --- docs/_data/browser-bugs.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml index 5f11e36a71..a666dc9b45 100644 --- a/docs/_data/browser-bugs.yml +++ b/docs/_data/browser-bugs.yml @@ -1,3 +1,13 @@ +- + browser: > + Microsoft Edge + summary: > + Visual artifacts in scrollable modal dialogs + upstream_bug: > + Edge#9011176 + origin: > + Bootstrap#20755 + - browser: > Microsoft Edge From b6fdf61e907688ad5f2a1927f0adc3ab17337971 Mon Sep 17 00:00:00 2001 From: Harish Gadiya Date: Tue, 12 Sep 2017 23:24:12 +0530 Subject: [PATCH 2/6] Fixed footer broken links (#23808) --- _config.yml | 2 ++ docs/_includes/footer.html | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 6116e559d7..b647b349cd 100644 --- a/_config.yml +++ b/_config.yml @@ -10,6 +10,7 @@ source: docs destination: _gh_pages host: 0.0.0.0 port: 9001 +baseurl: "" url: http://getbootstrap.com encoding: UTF-8 @@ -18,6 +19,7 @@ gems: # Custom vars current_version: 3.3.7 +docs_version: 3.3 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 6a41c7d090..95aba9ce20 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.

From 8b727783d8167ce3c55b3ff4ce4476f2d88fa186 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 12 Sep 2017 20:54:36 +0300 Subject: [PATCH 3/6] Update Gemfile.lock so that it works with platform ruby too. (#23275) (#23927) --- Gemfile.lock | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1b5dc3e902..dbbace5b23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,8 @@ GEM specs: addressable (2.4.0) colorator (0.1) - 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) @@ -13,26 +14,31 @@ 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 x64-mingw32 DEPENDENCIES @@ -40,4 +46,4 @@ DEPENDENCIES jekyll-sitemap (~> 0.11.0) BUNDLED WITH - 1.12.5 + 1.15.3 From 37e65feeda32decf1ee74daaf4d86ea6ed904eb0 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 17 Sep 2017 08:51:56 +0300 Subject: [PATCH 4/6] Unset `_JAVA_OPTIONS` env variable. It's causing build failures. See travis-ci/travis-ci#8408 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) 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 From e52df5dce5b11930dd8d8a8543f8cc3a8eab7375 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Sun, 24 Sep 2017 13:46:16 +0200 Subject: [PATCH 5/6] Update contributing.md with correct branch (`v4-dev` instead of `master`) --- CONTRIBUTING.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 From 2c2ac3356425e192f7537227508c809a14aa5850 Mon Sep 17 00:00:00 2001 From: Craig Main Date: Wed, 4 Oct 2017 10:50:46 +0300 Subject: [PATCH 6/6] Prevent empty carousel from throwing, and staying in a 'sliding' state. Fixes #24132. --- js/carousel.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/carousel.js b/js/carousel.js index 6ff954c9bd..2091bc351d 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