Merge branch 'v4-dev' into v4-dev-xmr-docs-fw-600

.travis.yml

@@ -8,8 +8,6 @@ git:
 node_js:
   - "6"
   - "8"
-before_install:
-  - if [[ `npm -v` != 5* ]]; then npm install -g npm@5; fi
 install:
   - bundle install --deployment --jobs=3 --retry=3
   - npm install
@@ -26,7 +24,7 @@ jobs:
   include:
     - stage: browser
       node_js: 8
-      script: if ! git log --format=%B --no-merges -n 1 | grep '\[skip browser\]'; then npm test && npm run js-test-cloud; fi
+      script: if ! git log --format=%B --no-merges -n 1 | grep '\[skip browser\]'; then npm run js-test-cloud; fi
 cache:
   directories:
     - node_modules

README.md

@@ -64,8 +64,8 @@ Read the [Getting started page](https://getbootstrap.com/docs/4.1/getting-starte
 [![peerDependencies Status](https://img.shields.io/david/peer/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap?type=peer)
 [![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap?type=dev)
 [![Coverage Status](https://img.shields.io/coveralls/github/twbs/bootstrap/v4-dev.svg)](https://coveralls.io/github/twbs/bootstrap?branch=v4-dev)
-[![CSS gzip size](http://img.badgesize.io/twbs/bootstrap/v4-dev/dist/css/bootstrap.min.css?compression=gzip&label=CSS+gzip+size)](https://github.com/twbs/bootstrap/tree/v4-dev/dist/css/bootstrap.min.css)
-[![JS gzip size](http://img.badgesize.io/twbs/bootstrap/v4-dev/dist/js/bootstrap.min.js?compression=gzip&label=JS+gzip+size)](https://github.com/twbs/bootstrap/tree/v4-dev/dist/js/bootstrap.min.js)
+[![CSS gzip size](https://img.badgesize.io/twbs/bootstrap/v4-dev/dist/css/bootstrap.min.css?compression=gzip&label=CSS+gzip+size)](https://github.com/twbs/bootstrap/tree/v4-dev/dist/css/bootstrap.min.css)
+[![JS gzip size](https://img.badgesize.io/twbs/bootstrap/v4-dev/dist/js/bootstrap.min.js?compression=gzip&label=JS+gzip+size)](https://github.com/twbs/bootstrap/tree/v4-dev/dist/js/bootstrap.min.js)
 [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=SkxZcStBeExEdVJqQ2hWYnlWckpkNmNEY213SFp6WHFETWk2bGFuY3pCbz0tLXhqbHJsVlZhQnRBdEpod3NLSDMzaHc9PQ==--3d0b75245708616eb93113221beece33e680b229)](https://www.browserstack.com/automate/public-build/SkxZcStBeExEdVJqQ2hWYnlWckpkNmNEY213SFp6WHFETWk2bGFuY3pCbz0tLXhqbHJsVlZhQnRBdEpod3NLSDMzaHc9PQ==--3d0b75245708616eb93113221beece33e680b229)
 
 ## What's included
@@ -120,7 +120,7 @@ Documentation search is powered by [Algolia's DocSearch](https://community.algol
 3. Run `npm start` to compile CSS and JavaScript files, generate our docs, and watch for changes.
 4. Open `http://localhost:9001` in your browser, and voilà.
 
-Learn more about using Jekyll by reading its [documentation](https://jekyllrb.com/docs/home/).
+Learn more about using Jekyll by reading its [documentation](https://jekyllrb.com/docs/).
 
 ### Documentation for previous releases
 

js/tests/README.md

@@ -1,6 +1,6 @@
 ## How does Bootstrap's test suite work?
 
-Bootstrap uses [QUnit](https://qunitjs.com/) and [Sinon](http://sinonjs.org/). Each plugin has a file dedicated to its tests in `unit/<plugin-name>.js`.
+Bootstrap uses [QUnit](https://qunitjs.com/) and [Sinon](https://sinonjs.org/). Each plugin has a file dedicated to its tests in `unit/<plugin-name>.js`.
 
 * `unit/` contains the unit test files for each Bootstrap plugin.
 * `vendor/` contains third-party testing-related code (QUnit, jQuery and Sinon).

package.json

@@ -55,6 +55,7 @@
     "js-test-karma-old": "cross-env USE_OLD_JQUERY=true npm run js-test-karma",
     "js-test-karma-bundle": "cross-env BUNDLE=true npm run js-test-karma",
     "js-test-karma-bundle-old": "cross-env BUNDLE=true USE_OLD_JQUERY=true npm run js-test-karma",
+    "prejs-test-cloud": "npm run js-compile && npm run js-test-karma",
     "js-test-cloud": "cross-env BROWSER=true npm run js-test-karma",
     "coveralls": "shx cat js/coverage/lcov.info | coveralls",
     "docs": "npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-lint",

site/_data/core-team.yml

@@ -0,0 +1,23 @@
+- name: Mark Otto
+  user: mdo
+
+- name: Jacob Thornton
+  user: fat
+
+- name: Chris Rebert
+  user: cvrebert
+
+- name: XhmikosR
+  user: xhmikosr
+
+- name: Patrick H. Lauke
+  user: patrickhlauke
+
+- name: Gleb Mazovetskiy
+  user: glebm
+
+- name: Johann-S
+  user: johann-s
+
+- name: Andres Galante
+  user: andresgalante

site/_data/nav.yml

@@ -81,6 +81,7 @@
 - title: About
   pages:
     - title: Overview
+    - title: Team
     - title: Brand
     - title: License
     - title: Translations

site/_data/translations.yml

@@ -1,12 +1,12 @@
 - name: 中文(繁體)
   code: zh-tw
   description: Bootstrap 4 繁體中文手冊
-  url: http://bootstrap.hexschool.com/
+  url: https://bootstrap.hexschool.com/
 
 - name: Chinese
   code: zh
   description: Bootstrap 4 · 全球最流行的 HTML、CSS 和 JS 工具库。
-  url: https://code.z01.com/v4
+  url: https://code.z01.com/v4/
 
 - name: Chinese
   code: zh
@@ -16,4 +16,4 @@
 - name: Brazilian Portuguese
   code: pt-BR
   description: Bootstrap 4 Português do Brasil
-  url: http://getbootstrap.com.br/v4/
+  url: https://getbootstrap.com.br/v4/

site/docs/4.1/about/overview.md

@@ -5,7 +5,6 @@ description: Learn more about the team maintaining Bootstrap, how and why the pr
 redirect_from:
   - "/docs/4.1/about/"
   - "/docs/4.1/history/"
-  - "/docs/4.1/team/"
 group: about
 ---
 

site/docs/4.1/about/team.md

@@ -0,0 +1,21 @@
+---
+layout: docs
+title: Team
+description: An overview of the founding team and core contributors to Bootstrap.
+group: about
+---
+
+Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.
+
+<div class="list-group mb-3">
+  {% for member in site.data.core-team %}
+    <a class="list-group-item list-group-item-action d-flex align-items-center" href="https://github.com/{{ member.user }}">
+      <img src="https://github.com/{{ member.user }}.png" alt="@{{ member.user }}" width="32" height="32" class="rounded mr-2">
+      <span>
+        <strong>{{ member.name }}</strong> @{{ member.user }}
+      </span>
+    </a>
+  {% endfor %}
+</div>
+
+Get involved with Bootstrap development by [opening an issue]({{ site.repo }}/issues/new) or submitting a pull request. Read our [contributing guidelines]({{ site.repo }}/blob/v{{ site.current_version }}/.github/CONTRIBUTING.md) for information on how we develop.

site/docs/4.1/content/images.md

@@ -39,7 +39,7 @@ In addition to our [border-radius utilities]({{ site.baseurl }}/docs/{{ site.doc
 
 ## Aligning images
 
-Align images with the [helper float classes]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/float) or [text alignment classes]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/text/#text-alignment). `block`-level images can be centered using [the `.mx-auto` margin utility class]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/spacing/#horizontal-centering).
+Align images with the [helper float classes]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/float/) or [text alignment classes]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/text/#text-alignment). `block`-level images can be centered using [the `.mx-auto` margin utility class]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/spacing/#horizontal-centering).
 
 <div class="bd-example bd-example-images">
   <img data-src="holder.js/200x200" class="rounded float-left" alt="A generic square placeholder image with rounded corners">

site/docs/4.1/examples/sticky-footer-navbar/index.html

@@ -50,7 +50,7 @@
       <div class="container">
         <h1 class="mt-5">Sticky footer with fixed navbar</h1>
         <p class="lead">Pin a footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added with <code>padding-top: 60px;</code> on the <code>main &gt; .container</code>.</p>
-        <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
+        <p>Back to <a href="../sticky-footer/">the default sticky footer</a> minus the navbar.</p>
       </div>
     </main>
 

site/docs/4.1/examples/sticky-footer/index.html

@@ -23,7 +23,7 @@
       <div class="container">
         <h1 class="mt-5">Sticky footer</h1>
         <p class="lead">Pin a footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.</p>
-        <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p>
+        <p>Use <a href="../sticky-footer-navbar/">the sticky footer with a fixed navbar</a> if need be, too.</p>
       </div>
     </main>
 

site/docs/4.1/extend/icons.md

@@ -20,7 +20,7 @@ We've tested and used these icon sets ourselves.
 While we haven't tried these out, they do look promising and provide multiple formats—including SVG.
 
 - [Bytesize](https://github.com/danklammer/bytesize-icons)
-- [Google Material icons](https://material.io/icons/)
+- [Google Material icons](https://material.io/tools/icons/)
 - [Ionicons](https://ionicons.com/)
 - [Feather](https://feathericons.com/)
 - [Dripicons](http://demo.amitjakhu.com/dripicons/)