Merge branch 'v4-dev' into yiq-function-update

Author: gijsbotje

.hound.yml

@@ -2,16 +2,18 @@ fail_on_violations: true
 
 stylelint:
   config_file: build/.stylelintrc
+  enabled: true
+  ignore_file: .houndignore
+
+eslint:
+  config_file: js/.eslintrc.json
+  ignore_file: .houndignore
 
 scss:
   enabled: false
 
 jshint:
   enabled: false
 
-eslint:
-  config_file: js/.eslintrc.json
-  ignore_file: .houndignore
-
 ruby:
   enabled: false

Gemfile

@@ -4,5 +4,5 @@ group :development, :test do
   gem 'jekyll', '~> 3.6.0'
   gem 'jekyll-redirect-from', '~> 0.12.1'
   gem 'jekyll-sitemap', '~> 1.1.1'
-  gem 'jekyll-toc', '~> 0.3.0'
+  gem 'jekyll-toc', '~> 0.4.0.rc2'
 end

Gemfile.lock

@@ -24,7 +24,7 @@ GEM
       sass (~> 3.4)
     jekyll-sitemap (1.1.1)
       jekyll (~> 3.3)
-    jekyll-toc (0.3.0)
+    jekyll-toc (0.4.0.rc2)
       nokogiri (~> 1.6)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
@@ -39,15 +39,15 @@ GEM
       mini_portile2 (~> 2.3.0)
     nokogiri (1.8.1-x64-mingw32)
       mini_portile2 (~> 2.3.0)
-    pathutil (0.14.0)
+    pathutil (0.16.0)
       forwardable-extended (~> 2.6)
     public_suffix (3.0.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rouge (2.2.1)
     safe_yaml (1.0.4)
-    sass (3.5.1)
+    sass (3.5.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -61,7 +61,7 @@ DEPENDENCIES
   jekyll (~> 3.6.0)
   jekyll-redirect-from (~> 0.12.1)
   jekyll-sitemap (~> 1.1.1)
-  jekyll-toc (~> 0.3.0)
+  jekyll-toc (~> 0.4.0.rc2)
 
 BUNDLED WITH
    1.15.4

README.md

@@ -1,20 +1,20 @@
 <p align="center">
   <a href="https://getbootstrap.com/">
-    <img src="https://getbootstrap.com/assets/brand/bootstrap-solid.svg" width=72 height=72>
+    <img src="https://getbootstrap.com/assets/brand/bootstrap-solid.svg" alt="" width=72 height=72>
   </a>
 
   <h3 align="center">Bootstrap</h3>
 
   <p align="center">
     Sleek, intuitive, and powerful front-end framework for faster and easier web development.
     <br>
-    <a href="https://getbootstrap.com/docs/4.0/"><strong>Explore Bootstrap docs &raquo;</strong></a>
+    <a href="https://getbootstrap.com/docs/4.0/"><strong>Explore Bootstrap docs »</strong></a>
     <br>
     <br>
     <a href="https://themes.getbootstrap.com/">Bootstrap Themes</a>
-    &middot;
+    ·
     <a href="https://jobs.getbootstrap.com/">Job Board</a>
-    &middot;
+    ·
     <a href="https://blog.getbootstrap.com/">Blog</a>
   </p>
 </p>
@@ -50,16 +50,18 @@ Read the [Getting started page](https://getbootstrap.com/getting-started/) for i
 ## Status
 
 [![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com/)
+[![Build Status](https://img.shields.io/travis/twbs/bootstrap/v4-dev.svg)](https://travis-ci.org/twbs/bootstrap)
 [![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap)
 [![Gem version](https://img.shields.io/gem/v/bootstrap.svg)](https://rubygems.org/gems/bootstrap)
-[![Build Status](https://img.shields.io/travis/twbs/bootstrap/v4-dev.svg)](https://travis-ci.org/twbs/bootstrap)
-[![peerDependencies Status](https://david-dm.org/twbs/bootstrap/peer-status.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)
 [![Meteor Atmosphere](https://img.shields.io/badge/meteor-twbs%3Abootstrap-blue.svg)](https://atmospherejs.com/twbs/bootstrap)
 [![Packagist Prerelease](https://img.shields.io/packagist/vpre/twbs/bootstrap.svg)](https://packagist.org/packages/twbs/bootstrap)
 [![NuGet](https://img.shields.io/nuget/vpre/bootstrap.svg)](https://www.nuget.org/packages/bootstrap/absoluteLatest)
+[![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)
+[![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)
 
-[![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
+[![Sauce Labs Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
 
 ## What's included
 
@@ -71,7 +73,15 @@ bootstrap/
 │   ├── bootstrap.css
 │   ├── bootstrap.css.map
 │   ├── bootstrap.min.css
-│   └── bootstrap.min.css.map
+│   ├── bootstrap.min.css.map
+│   ├── bootstrap-grid.css
+│   ├── bootstrap-grid.css.map
+│   ├── bootstrap-grid.min.css
+│   ├── bootstrap-grid.min.css.map
+│   ├── bootstrap-reboot.css
+│   ├── bootstrap-reboot.css.map
+│   ├── bootstrap-reboot.min.css
+│   └── bootstrap-reboot.min.css.map
 └── js/
     ├── bootstrap.js
     └── bootstrap.min.js
@@ -87,13 +97,13 @@ Have a bug or a feature request? Please first read the [issue guidelines](https:
 
 ## Documentation
 
-Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](https://jekyllrb.com) and publicly hosted on GitHub Pages at <https://getbootstrap.com>. The docs may also be run locally.
+Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](https://jekyllrb.com/) and publicly hosted on GitHub Pages at <https://getbootstrap.com/>. The docs may also be run locally.
 
 Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in the `_scripts.html` include.
 
 ### Running documentation locally
 
-1. Run through the [tooling setup](https://github.com/twbs/bootstrap/blob/v4-dev/docs/4.0/getting-started/build-tools.md#tooling-setup) to install Jekyll (the site builder) and other Ruby dependencies with `bundle install`.
+1. Run through the [tooling setup](https://getbootstrap.com/docs/4.0/getting-started/build-tools/#tooling-setup) to install Jekyll (the site builder) and other Ruby dependencies with `bundle install`.
 2. Run `npm install` to install Node.js dependencies.
 3. Run `npm run test` (or a specific NPM script) to rebuild distributed CSS and JavaScript files, as well as our docs assets.
 4. From the root `/bootstrap` directory, run `npm run docs-serve` in the command line.
@@ -109,15 +119,13 @@ Learn more about using Jekyll by reading its [documentation](https://jekyllrb.co
 [Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download.
 
 
-
 ## Contributing
 
 Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
 
 Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/twbs/bootstrap/tree/master/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
 
-Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
-
+Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org/>.
 
 
 ## Community
@@ -132,7 +140,6 @@ Get updates on Bootstrap's development and chat with the project maintainers and
 - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
 
 
-
 ## Versioning
 
 For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.
@@ -153,7 +160,6 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr
 - <https://github.com/fat>
 
 
-
 ## Copyright and license
 
 Code and documentation copyright 2011-2017 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).

_data/colors.yml

@@ -1,26 +1,26 @@
 - name: blue
-  hex: "#007aff"
+  hex: "#007bff"
 - name: indigo
-  hex: "#2b29bb"
+  hex: "#6610f2"
 - name: purple
-  hex: "#882ae0"
+  hex: "#6f42c1"
 - name: pink
-  hex: "#f14095"
+  hex: "#e83e8c"
 - name: red
-  hex: "#ea0242"
+  hex: "#dc3545"
 - name: orange
-  hex: "#ff8d00"
+  hex: "#fd7e14"
 - name: yellow
-  hex: "#ffec00"
+  hex: "#ffc107"
 - name: green
-  hex: "#34da36"
+  hex: "#28a745"
 - name: teal
-  hex: "#1dde8e"
+  hex: "#20c997"
 - name: cyan
-  hex: "#08eff3"
+  hex: "#17a2b8"
 - name: white
   hex: "#fff"
 - name: gray
-  hex: "#464a4c"
+  hex: "#868e96"
 - name: gray-dark
-  hex: "#292b2c"
+  hex: "#343a40"

_data/grays.yml

@@ -1,18 +1,18 @@
 - name: 100
   hex: "#f8f9fa"
 - name: 200
-  hex: "#ebedef"
+  hex: "#e9ecef"
 - name: 300
-  hex: "#ced3d8"
+  hex: "#dee2e6"
 - name: 400
-  hex: "#abb3bd"
+  hex: "#ced4da"
 - name: 500
-  hex: "#7c8a99"
+  hex: "#adb5bd"
 - name: 600
-  hex: "#55626f"
+  hex: "#868e96"
 - name: 700
-  hex: "#4a5560"
+  hex: "#495057"
 - name: 800
-  hex: "#384048"
+  hex: "#343a40"
 - name: 900
-  hex: "#131619"
+  hex: "#212529"

_data/theme-colors.yml

@@ -1,5 +1,5 @@
 - name: primary
-  hex: "#007aff"
+  hex: "#007bff"
 - name: secondary
   hex: "#868e96"
 - name: success

_includes/icons/import.svg

@@ -1,3 +1,5 @@
+// stylelint-disable no-duplicate-selectors
+
 //
 // Brand guidelines
 //

assets/scss/_brand.scss

@@ -1,4 +1,4 @@
-// stylelint-disable selector-no-qualifying-type
+// stylelint-disable no-duplicate-selectors, selector-no-qualifying-type
 
 //
 // Grid examples

assets/scss/_component-examples.scss

@@ -1,4 +1,4 @@
-// stylelint-disable selector-max-combinators, selector-max-compound-selectors, selector-max-type, selector-no-qualifying-type
+// stylelint-disable no-duplicate-selectors, selector-max-combinators, selector-max-compound-selectors, selector-max-type, selector-no-qualifying-type
 
 //
 // Automatically style Markdown-based tables like a Bootstrap `.table`.

assets/scss/_content.scss

@@ -19,7 +19,7 @@
     "declaration-block-semicolon-space-after": "always-single-line",
     "declaration-empty-line-before": null,
     "declaration-no-important": true,
-    "font-family-name-quotes": "always-where-required",
+    "font-family-name-quotes": "always-where-recommended",
     "font-weight-notation": "numeric",
     "function-comma-space-after": null,
     "function-url-no-scheme-relative": true,
@@ -32,7 +32,7 @@
     "media-feature-range-operator-space-after": "always",
     "media-feature-range-operator-space-before": "never",
     "no-descending-specificity": null,
-    "no-duplicate-selectors": null,
+    "no-duplicate-selectors": true,
     "number-leading-zero": "never",
     "order/properties-order": [
       "position",

build/.stylelintrc

@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+
+/*!
+ * Script to run vnu-jar if Java is available.
+ * Copyright 2017 The Bootstrap Authors
+ * Copyright 2017 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+'use strict'
+
+const childProcess = require('child_process')
+const vnu = require('vnu-jar')
+
+childProcess.exec('java -version', function (error) {
+  if (error) {
+    console.error('Skipping HTML lint test; Java is missing.')
+    return
+  }
+
+  const ignores = [
+    'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime-local”, “email”, “hidden”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.',
+    'Attribute “autocomplete” not allowed on element “button” at this point.',
+    'Attribute “title” not allowed on element “circle” at this point.',
+    'Bad value “tablist” for attribute “role” on element “nav”.',
+    'Element “img” is missing required attribute “src”.',
+    'Element “legend” not allowed as child of element “div” in this context.*'
+  ].join('|')
+
+  const args = [
+    '-jar',
+    vnu,
+    '--asciiquotes',
+    '--errors-only',
+    '--skip-non-html',
+    `--filterpattern "${ignores}"`,
+    '_gh_pages/',
+    'js/tests/'
+  ]
+
+  return childProcess.spawn('java', args, {
+    shell: true,
+    stdio: 'inherit'
+  })
+  .on('exit', process.exit)
+})

build/htmllint.js

@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = (ctx) => ({
-  map: ctx.file.dirname.startsWith('docs') ? false : {
+  map: ctx.file.dirname.includes('examples') ? false : {
     inline: false,
     annotation: true,
     sourcesContent: true