Merge pull request #1 from twbs/v4-dev

updating fork of BS to v4-beta1

js/.babelrc → .babelrc

@@ -3,8 +3,8 @@
     [
       "es2015",
       {
-        "modules": false,
-        "loose": true
+        "loose": true,
+        "modules": false
       }
     ]
   ],

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -25,13 +25,9 @@ restrictions:
   respect the opinions of others.
 
 * Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
-  Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) 
+  Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments)
   instead. We reserve the right to delete comments which violate this rule.
 
-* Please **do not** open issues or pull requests regarding the code in
-  [`Normalize`](https://github.com/necolas/normalize.css) (open them in
-  its repository).
-
 * Please **do not** open issues regarding the official themes offered on <https://themes.getbootstrap.com/>.
   Instead, please email any questions or feedback regarding those themes to `themes AT getbootstrap DOT com`.
 
@@ -46,7 +42,7 @@ Our bug tracker utilizes several labels to help organize and identify issues. He
 - `docs` - Issues for improving or updating our documentation.
 - `examples` - Issues involving the example templates included in our docs.
 - `feature` - Issues asking for a new feature to be added, or an existing one to be extended or modified. New features require a minor version bump (e.g., `v3.0.0` to `v3.1.0`).
-- `grunt` - Issues with our included JavaScript-based Gruntfile, which is used to run all our tests, concatenate and compile source files, and more.
+- `grunt` - Issues with our build system, which is used to run all our tests, concatenate and compile source files, and more.
 - `help wanted` - Issues we need or would love help from the community to resolve.
 - `js` - Issues stemming from our compiled or source JavaScript files.
 - `meta` - Issues with the project itself or our GitHub repository.
@@ -73,7 +69,7 @@ Guidelines for bug reports:
 
 3. **Isolate the problem** &mdash; ideally create a [reduced test
    case](https://css-tricks.com/reduced-test-cases/) and a live example.
-   [This JS Bin](https://jsbin.com/qusafa/edit?html,output) is a helpful template.
+   [This JS Bin](https://jsbin.com/lolome/edit?html,output) is a helpful template.
 
 
 A good bug report shouldn't leave others needing to chase you up for more
@@ -245,7 +241,7 @@ includes code changes) and under the terms of the
 
 ### Checking coding style
 
-Run `grunt test` before committing to ensure your changes follow our coding standards.
+Run `npm run test` before committing to ensure your changes follow our coding standards.
 
 
 ## License

.hound.yml

@@ -1,19 +1,14 @@
 fail_on_violations: true
 
 scss:
-  config_file: scss/.scss-lint.yml
-  enabled: true
+  config_file: .scss-lint.yml
 
-javascript:
+jshint:
   enabled: false
 
 eslint:
-  enabled: true
   config_file: js/.eslintrc.json
-
-jscs:
-  enabled: true
-  config_file: js/.jscsrc
+  ignore_file: .houndignore
 
 ruby:
   enabled: false

.houndignore

@@ -0,0 +1,4 @@
+**/*.min.js
+**/vendor/*
+**/dist/*
+js/tests/*

scss/.scss-lint.yml → .scss-lint.yml

@@ -1,11 +1,8 @@
 # Default application configuration that all configurations inherit from.
 scss_files:
-  - "**/*.scss"
+  - "scss/**/*.scss"
   - "docs/assets/scss/**/*.scss"
 
-exclude:
-  - "scss/_normalize.scss"
-
 plugin_directories: ['.scss-linters']
 
 # List of gem names to load custom linters from (make sure they are already
@@ -28,8 +25,6 @@ linters:
   BorderZero:
     enabled: true
     convention: zero # or `none`
-    exclude:
-      - _normalize.scss
 
   ChainedClasses:
     enabled: false
@@ -43,8 +38,7 @@ linters:
   Comment:
     enabled: true
     exclude:
-      - _normalize.scss
-      - bootstrap.scss
+      - scss/bootstrap.scss
     style: silent
 
   DebugStatement:
@@ -108,8 +102,6 @@ linters:
   LeadingZero:
     enabled: true
     style: exclude_zero # or 'include_zero'
-    exclude:
-      - _normalize.scss
 
   MergeableSelector:
     enabled: false
@@ -122,7 +114,7 @@ linters:
 
   NestingDepth:
     enabled: true
-    max_depth: 4
+    max_depth: 5
     ignore_parent_selectors: false
 
   PlaceholderInExtend:
@@ -138,8 +130,6 @@ linters:
     ignore_unspecified: false
     min_properties: 2
     separate_groups: false
-    exclude:
-      - _normalize.scss
     order:
       - position
       - top
@@ -160,6 +150,10 @@ linters:
       - flex-grow
       - flex-order
       - flex-pack
+      - align-items
+      - align-self
+      - justify-content
+      - order
       - float
       - width
       - min-width
@@ -535,8 +529,6 @@ linters:
     identifier_list: base
     additional_identifiers: []
     excluded_identifiers: []
-    exclude:
-      - _normalize.scss
 
   ZeroUnit:
     enabled: true

.travis.yml

@@ -1,44 +1,34 @@
-sudo: required
+sudo: false
 dist: trusty
 language: node_js
 git:
-  depth: 10
+  depth: 3
 node_js:
   - "4"
-  - "6"
+  - "8"
 before_install:
-  # Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
-  - export PATH=$(python -c 'from sys import argv;from collections import OrderedDict as od;print(":".join(od((p,None) for p in argv[1].split(":") if p.startswith("/")).keys()))' "$PATH")
-  - rvm install 2.2
-  - rvm use 2.2 --fuzzy
-  - npm install -g npm@3
-  - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
-  - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true
-  - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true
-  - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi
+  - if [[ `npm -v` != 5* ]]; then npm install -g npm@5; fi
+  - "export TRAVIS_COMMIT_MSG=\"`git log --format=%B --no-merges -n 1`\""
+  - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip browser\]'; export TWBS_DO_BROWSER=$?; true
 install:
-  - bundle install --deployment --jobs=3
-  - cp grunt/npm-shrinkwrap.json ./
+  - bundle install --deployment --jobs=3 --retry=3
   - npm install
+script:
+  - npm test
+  - if [ "$TWBS_TEST" = browser -a "$SAUCE_ACCESS_KEY" ]; then npm run js-test-cloud; fi
+after_success:
+  - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then npm run docs-upload-preview; fi
 cache:
   directories:
     - node_modules
     - vendor/bundle
-    - "$HOME/google-cloud-sdk"
 env:
-  global:
-    - NPM_CONFIG_PROGRESS="false"
-  matrix:
-    - TWBS_TEST=core
-    - TWBS_TEST=validate-html
-    - TWBS_TEST=sauce-js-unit
+  - TWBS_TEST=core
+  - TWBS_TEST=browser
 matrix:
-  fast_finish: true
   exclude:
     - node_js: "4"
-      env: TWBS_TEST=validate-html
-    - node_js: "4"
-      env: TWBS_TEST=sauce-js-unit
+      env: TWBS_TEST=browser
 notifications:
   slack: heybb:iz4wwosL0N0EdaX1gvgkU0NH
   webhooks:

Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'jekyll', '~> 3.3.0'
-  gem 'jekyll-redirect-from', '~> 0.11.0'
-  gem 'jekyll-sitemap', '~> 0.11.0'
-  gem 'scss_lint', '~> 0.50.2'
+  gem 'jekyll', '~> 3.5.1'
+  gem 'jekyll-redirect-from', '~> 0.12.1'
+  gem 'jekyll-sitemap', '~> 1.1.1'
+  gem 'jekyll-toc', '~> 0.3.0.pre1'
+  gem 'scss_lint', '~> 0.54.0'
 end

Gemfile.lock

@@ -1,56 +1,68 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     colorator (1.1.0)
-    ffi (1.9.14)
+    ffi (1.9.18)
+    ffi (1.9.18-x64-mingw32)
     forwardable-extended (2.6.0)
-    jekyll (3.3.0)
+    jekyll (3.5.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 3.0)
+      liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-redirect-from (0.11.0)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.4.0)
+    jekyll-redirect-from (0.12.1)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.5.0)
       sass (~> 3.4)
-    jekyll-sitemap (0.11.0)
-      addressable (~> 2.4.0)
+    jekyll-sitemap (1.1.1)
+      jekyll (~> 3.3)
+    jekyll-toc (0.3.0)
+      nokogiri (~> 1.6)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    kramdown (1.12.0)
-    liquid (3.0.6)
+    kramdown (1.14.0)
+    liquid (4.0.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
+    mini_portile2 (2.2.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.0-x64-mingw32)
+      mini_portile2 (~> 2.2.0)
     pathutil (0.14.0)
       forwardable-extended (~> 2.6)
-    rake (11.3.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
+    public_suffix (2.0.5)
+    rake (12.0.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)
-    scss_lint (0.50.2)
-      rake (>= 0.9, < 12)
+    sass (3.4.25)
+    scss_lint (0.54.0)
+      rake (>= 0.9, < 13)
       sass (~> 3.4.20)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
-  jekyll (~> 3.3.0)
-  jekyll-redirect-from (~> 0.11.0)
-  jekyll-sitemap (~> 0.11.0)
-  scss_lint (~> 0.50.2)
+  jekyll (~> 3.5.1)
+  jekyll-redirect-from (~> 0.12.1)
+  jekyll-sitemap (~> 1.1.1)
+  jekyll-toc (~> 0.3.0.pre1)
+  scss_lint (~> 0.54.0)
 
 BUNDLED WITH
-   1.13.2
+   1.15.3