Merge branch 'v4-dev' into rip-custom

twbs · Jun 15, 2017 · 5818374 · 5818374
2 parents aa8c456 + 2e79830
commit 5818374
Show file tree

Hide file tree

Showing 49 changed files with 1,463 additions and 1,060 deletions.
diff --git a/.scss-lint.yml b/.scss-lint.yml
@@ -114,7 +114,7 @@ linters:
 
   NestingDepth:
     enabled: true
-    max_depth: 4
+    max_depth: 5
     ignore_parent_selectors: false
 
   PlaceholderInExtend:

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -18,7 +18,7 @@ module.exports = function (grunt) {
           concurrency: 10,
           maxRetries: 3,
           maxPollRetries: 4,
-          urls: ['http://127.0.0.1:3000/js/tests/index.html?hidepassed'],
+          urls: ['http://localhost:3000/js/tests/index.html?hidepassed'],
           browsers: grunt.file.readYAML('build/sauce_browsers.yml')
         }
       }

diff --git a/_config.yml b/_config.yml
@@ -53,5 +53,5 @@ cdn:
   js_hash:        "sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn"
   jquery:         https://code.jquery.com/jquery-3.2.1.slim.min.js
   jquery_hash:    "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
-  popper:         https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.9.9/umd/popper.min.js
-  popper_hash:    "sha256-c477vRLKQv1jt9o7w6TTBzFyFznTaZjoMLTDFi7Hlxc="
+  popper:         https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.10.1/umd/popper.min.js
+  popper_hash:    "sha256-nxD3NU7Wocq19nG7DTQAx9troUwVoxjUhYrAhFSO3HM="
diff --git a/assets/css/docs.min.css b/assets/css/docs.min.css
diff --git a/assets/css/docs.min.css.map b/assets/css/docs.min.css.map
diff --git a/assets/js/vendor/popper.min.js b/assets/js/vendor/popper.min.js
diff --git a/assets/scss/_sidebar.scss b/assets/scss/_sidebar.scss
@@ -1,7 +1,7 @@
 // scss-lint:disable VendorPrefix
 
 //
-// Side navigation
+// Right side table of contents
 //
 
 .bd-toc {
@@ -34,7 +34,7 @@
 
   a {
     display: block;
-    padding: .25rem 1.5rem;
+    padding: .125rem 1.5rem;
     color: #99979c;
 
     &:hover {
@@ -44,6 +44,10 @@
   }
 }
 
+//
+// Left side navigation
+//
+
 .bd-sidebar {
   background-color: #f5f2f9;
   border-bottom: 1px solid rgba(0,0,0,.1);

diff --git a/bower.json b/bower.json
@@ -32,6 +32,6 @@
   ],
   "dependencies": {
     "jquery": ">=1.9.1",
-    "popper.js": "^1.9.9"
+    "popper.js": "^1.10.1"
   }
 }
diff --git a/build/npm-shrinkwrap.json b/build/npm-shrinkwrap.json
diff --git a/dist/css/bootstrap-grid.css.map b/dist/css/bootstrap-grid.css.map
diff --git a/dist/css/bootstrap-reboot.css.map b/dist/css/bootstrap-reboot.css.map