Merge branch 'v4' of 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',
@@ -362,17 +359,9 @@ module.exports = function (grunt) {
         files: '<%= jscs.core.src %>',
         tasks: ['babel:dev']
       },
-      test: {
-        files: '<%= jscs.test.src %>',
-        tasks: ['qunit']
-      },
       sass: {
         files: 'scss/**/*.scss',
-        tasks: 'sass-compile'
+        tasks: ['sass-compile', 'postcss:core', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs', 'docs-css', 'clean:docs', 'copy:docs']
-      },
-      docs: {
-        files: 'docs/assets/scss/*.scss',
-        tasks: 'sass:docs'
       }
     },
 

docs/_includes/header.html

@@ -14,11 +14,7 @@
 </title>
 
 <!-- Bootstrap core CSS -->
-{% if jekyll.environment == "development" %}
-<link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet">
-{% else %}
 <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
-{% endif %}
 
 <!-- Documentation extras -->
 <link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">

docs/assets/js/src/application.js

@@ -0,0 +1,78 @@
+// 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)

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"
     ]
   },