Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Gruntfile.js

@@ -57,7 +57,6 @@ module.exports = function (grunt) {
     },
 
     // JS build configuration
-
     lineremover: {
       es6Import: {
         files: {
@@ -201,9 +200,7 @@ module.exports = function (grunt) {
       files: 'js/tests/index.html'
     },
 
-
     // CSS build configuration
-
     scsslint: {
       options: {
         config: 'scss/.scsslint.yml',

docs/assets/js/src/application.js

+// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
+// IT'S ALL JUST JUNK FOR OUR DOCS!
+// ++++++++++++++++++++++++++++++++++++++++++
+
+/*!
+ * JavaScript for Bootstrap's docs (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the Creative Commons Attribution 3.0 Unported License. For
+ * details, see https://creativecommons.org/licenses/by/3.0/.
+ */
+
+/* global ZeroClipboard, anchors */
+
+!function ($) {
+  'use strict';
+
+  $(function () {
+
+    // Tooltip and popover demos
+    $('.tooltip-demo').tooltip({
+      selector: '[data-toggle="tooltip"]',
+      container: 'body'
+    })
+
+    $('[data-toggle="popover"]').popover()
+
+    // Demos within modals
+    $('.tooltip-test').tooltip()
+    $('.popover-test').popover()
+
+    // Config ZeroClipboard
+    ZeroClipboard.config({
+      moviePath: '/assets/flash/ZeroClipboard.swf',
+      hoverClass: 'btn-clipboard-hover'
+    })
+
+    // Insert copy to clipboard button before .highlight
+    $('.highlight').each(function () {
+      var btnHtml = '<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>'
+      $(this).before(btnHtml)
+    })
+    var zeroClipboard = new ZeroClipboard($('.btn-clipboard'))
+    var $htmlBridge = $('#global-zeroclipboard-html-bridge')
+
+    // Handlers for ZeroClipboard
+    zeroClipboard.on('load', function () {
+      $htmlBridge
+        .data('placement', 'top')
+        .attr('title', 'Copy to clipboard')
+        .tooltip()
+
+      // Copy to clipboard
+      zeroClipboard.on('dataRequested', function (client) {
+        var highlight = $(this).parent().nextAll('.highlight').first()
+        client.setText(highlight.text())
+      })
+
+      // Notify copy success and reset tooltip title
+      zeroClipboard.on('complete', function () {
+        $htmlBridge
+          .attr('title', 'Copied!')
+          .tooltip('fixTitle')
+          .tooltip('show')
+          .attr('title', 'Copy to clipboard')
+          .tooltip('fixTitle')
+      })
+    })
+
+    // Hide copy button when no Flash is found
+    // or wrong Flash version is present
+    zeroClipboard.on('noflash wrongflash', function () {
+      $('.zero-clipboard').remove()
+      ZeroClipboard.destroy()
+    })
+
+  })
+
+}(jQuery)

docs/components/scrollspy.md

@@ -14,35 +14,21 @@ group: components
 The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.
 
 <div class="bd-example">
-  <nav id="navbar-example2" class="navbar navbar-default navbar-static" role="navigation">
-    <div class="container-fluid">
-      <div class="navbar-header">
-        <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target=".bd-example-js-navbar-scrollspy">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#">Project Name</a>
-      </div>
-      <div class="collapse navbar-collapse bd-example-js-navbar-scrollspy">
-        <ul class="nav navbar-nav">
-          <li><a href="#fat">@fat</a></li>
-          <li><a href="#mdo">@mdo</a></li>
-          <li class="dropdown">
-            <a href="#" id="navbarDrop1" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              Dropdown
-            </a>
-            <ul class="dropdown-menu" aria-labelledby="navbarDrop1">
-              <li><a href="#one">one</a></li>
-              <li><a href="#two">two</a></li>
-              <li role="separator" class="divider"></li>
-              <li><a href="#three">three</a></li>
-            </ul>
-          </li>
+  <nav id="navbar-example2" class="navbar navbar-default" role="navigation">
+    <h3 class="navbar-brand">Project Name</h3>
+    <ul class="nav nav-pills">
+      <li class="nav-item"><a class="nav-link" href="#fat">@fat</a></li>
+      <li class="nav-item"><a class="nav-link" href="#mdo">@mdo</a></li>
+      <li class="nav-item">
+        <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Dropdown</a>
+        <ul class="dropdown-menu">
+          <li><a href="#one">one</a></li>
+          <li><a href="#two">two</a></li>
+          <li role="separator" class="divider"></li>
+          <li><a href="#three">three</a></li>
         </ul>
-      </div>
-    </div>
+      </li>
+    </ul>
   </nav>
   <div data-spy="scroll" data-target="#navbar-example2" data-offset="0" class="scrollspy-example">
     <h4 id="fat">@fat</h4>

grunt/configBridge.json

@@ -5,6 +5,7 @@
       "assets/js/vendor/jekyll-search.js",
       "../assets/js/vendor/ZeroClipboard.min.js",
       "../assets/js/vendor/anchor.js",
+      "../assets/js/vendor/tether.min.js",
       "../assets/js/src/application.js"
     ]
   },