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

docs/dist/css/bootstrap.css

@@ -2332,11 +2332,6 @@ fieldset[disabled] .btn-primary:hover {
   border-color: #0275d8;
 }
 
-.btn-primary .badge {
-  color: #0275d8;
-  background-color: #fff;
-}
-
 .btn-secondary {
   color: #373a3c;
   background-color: #fff;
@@ -2382,11 +2377,6 @@ fieldset[disabled] .btn-secondary:hover {
   border-color: #ccc;
 }
 
-.btn-secondary .badge {
-  color: #fff;
-  background-color: #373a3c;
-}
-
 .btn-info {
   color: #fff;
   background-color: #5bc0de;
@@ -2432,11 +2422,6 @@ fieldset[disabled] .btn-info:hover {
   border-color: #5bc0de;
 }
 
-.btn-info .badge {
-  color: #5bc0de;
-  background-color: #fff;
-}
-
 .btn-success {
   color: #fff;
   background-color: #5cb85c;
@@ -2482,11 +2467,6 @@ fieldset[disabled] .btn-success:hover {
   border-color: #5cb85c;
 }
 
-.btn-success .badge {
-  color: #5cb85c;
-  background-color: #fff;
-}
-
 .btn-warning {
   color: #fff;
   background-color: #f0ad4e;
@@ -2532,11 +2512,6 @@ fieldset[disabled] .btn-warning:hover {
   border-color: #f0ad4e;
 }
 
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-
 .btn-danger {
   color: #fff;
   background-color: #d9534f;
@@ -2582,11 +2557,6 @@ fieldset[disabled] .btn-danger:hover {
   border-color: #d9534f;
 }
 
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-
 .btn-primary-outline {
   color: #0275d8;
   background-color: #fff;

docs/dist/js/umd/alert.js

@@ -51,7 +51,7 @@
     var Event = {
       CLOSE: 'close' + EVENT_KEY,
       CLOSED: 'closed' + EVENT_KEY,
-      CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY
+      CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
     };
 
     var ClassName = {
@@ -73,6 +73,14 @@
         this._element = element;
       }
 
+      /**
+       * ------------------------------------------------------------------------
+       * Data Api implementation
+       * ------------------------------------------------------------------------
+       */
+
+      // getters
+
       _createClass(Alert, [{
         key: 'close',
 
@@ -96,11 +104,11 @@
           $.removeData(this._element, DATA_KEY);
           this._element = null;
         }
-      }, {
-        key: '_getRootElement',
 
         // private
 
+      }, {
+        key: '_getRootElement',
         value: function _getRootElement(element) {
           var parent = false;
           var selector = _Util['default'].getSelectorFromElement(element);
@@ -139,11 +147,11 @@
         value: function _destroyElement(element) {
           $(element).detach().trigger(Event.CLOSED).remove();
         }
-      }], [{
-        key: '_jQueryInterface',
 
         // static
 
+      }], [{
+        key: '_jQueryInterface',
         value: function _jQueryInterface(config) {
           return this.each(function () {
             var $element = $(this);
@@ -172,10 +180,7 @@
         }
       }, {
         key: 'VERSION',
-
-        // getters
-
-        get: function () {
+        get: function get() {
           return VERSION;
         }
       }]);
@@ -183,12 +188,6 @@
       return Alert;
     })();
 
-    /**
-     * ------------------------------------------------------------------------
-     * Data Api implementation
-     * ------------------------------------------------------------------------
-     */
-
     $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()));
 
     /**

docs/dist/js/umd/button.js

@@ -55,8 +55,8 @@
     };
 
     var Event = {
-      CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY,
-      FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + '' + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + '' + DATA_API_KEY)
+      CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY,
+      FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY)
     };
 
     /**
@@ -72,6 +72,14 @@
         this._element = element;
       }
 
+      /**
+       * ------------------------------------------------------------------------
+       * Data Api implementation
+       * ------------------------------------------------------------------------
+       */
+
+      // getters
+
       _createClass(Button, [{
         key: 'toggle',
 
@@ -116,11 +124,11 @@
           $.removeData(this._element, DATA_KEY);
           this._element = null;
         }
-      }], [{
-        key: '_jQueryInterface',
 
         // static
 
+      }], [{
+        key: '_jQueryInterface',
         value: function _jQueryInterface(config) {
           return this.each(function () {
             var data = $(this).data(DATA_KEY);
@@ -137,10 +145,7 @@
         }
       }, {
         key: 'VERSION',
-
-        // getters
-
-        get: function () {
+        get: function get() {
           return VERSION;
         }
       }]);
@@ -148,12 +153,6 @@
       return Button;
     })();
 
-    /**
-     * ------------------------------------------------------------------------
-     * Data Api implementation
-     * ------------------------------------------------------------------------
-     */
-
     $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) {
       event.preventDefault();
 

docs/dist/js/umd/carousel.js

@@ -71,8 +71,8 @@
       KEYDOWN: 'keydown' + EVENT_KEY,
       MOUSEENTER: 'mouseenter' + EVENT_KEY,
       MOUSELEAVE: 'mouseleave' + EVENT_KEY,
-      LOAD_DATA_API: 'load' + EVENT_KEY + '' + DATA_API_KEY,
-      CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY
+      LOAD_DATA_API: 'load' + EVENT_KEY + DATA_API_KEY,
+      CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
     };
 
     var ClassName = {
@@ -118,6 +118,14 @@
         this._addEventListeners();
       }
 
+      /**
+       * ------------------------------------------------------------------------
+       * Data Api implementation
+       * ------------------------------------------------------------------------
+       */
+
+      // getters
+
       _createClass(Carousel, [{
         key: 'next',
 
@@ -211,11 +219,11 @@
           this._activeElement = null;
           this._indicatorsElement = null;
         }
-      }, {
-        key: '_getConfig',
 
         // private
 
+      }, {
+        key: '_getConfig',
         value: function _getConfig(config) {
           config = $.extend({}, Default, config);
           _Util['default'].typeCheckConfig(NAME, config, DefaultType);
@@ -371,11 +379,11 @@
             this.cycle();
           }
         }
-      }], [{
-        key: '_jQueryInterface',
 
         // static
 
+      }], [{
+        key: '_jQueryInterface',
         value: function _jQueryInterface(config) {
           return this.each(function () {
             var data = $(this).data(DATA_KEY);
@@ -434,15 +442,12 @@
         }
       }, {
         key: 'VERSION',
-
-        // getters
-
-        get: function () {
+        get: function get() {
           return VERSION;
         }
       }, {
         key: 'Default',
-        get: function () {
+        get: function get() {
           return Default;
         }
       }]);
@@ -450,12 +455,6 @@
       return Carousel;
     })();
 
-    /**
-     * ------------------------------------------------------------------------
-     * Data Api implementation
-     * ------------------------------------------------------------------------
-     */
-
     $(document).on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler);
 
     $(window).on(Event.LOAD_DATA_API, function () {

docs/dist/js/umd/collapse.js

@@ -59,7 +59,7 @@
       SHOWN: 'shown' + EVENT_KEY,
       HIDE: 'hide' + EVENT_KEY,
       HIDDEN: 'hidden' + EVENT_KEY,
-      CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY
+      CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
     };
 
     var ClassName = {
@@ -105,6 +105,14 @@
         }
       }
 
+      /**
+       * ------------------------------------------------------------------------
+       * Data Api implementation
+       * ------------------------------------------------------------------------
+       */
+
+      // getters
+
       _createClass(Collapse, [{
         key: 'toggle',
 
@@ -251,11 +259,11 @@
           this._triggerArray = null;
           this._isTransitioning = null;
         }
-      }, {
-        key: '_getConfig',
 
         // private
 
+      }, {
+        key: '_getConfig',
         value: function _getConfig(config) {
           config = $.extend({}, Default, config);
           config.toggle = !!config.toggle; // coerce string values
@@ -294,11 +302,11 @@
             }
           }
         }
-      }], [{
-        key: '_getTargetFromElement',
 
         // static
 
+      }], [{
+        key: '_getTargetFromElement',
         value: function _getTargetFromElement(element) {
           var selector = _Util['default'].getSelectorFromElement(element);
           return selector ? $(selector)[0] : null;
@@ -327,15 +335,12 @@
         }
       }, {
         key: 'VERSION',
-
-        // getters
-
-        get: function () {
+        get: function get() {
           return VERSION;
         }
       }, {
         key: 'Default',
-        get: function () {
+        get: function get() {
           return Default;
         }
       }]);
@@ -343,12 +348,6 @@
       return Collapse;
     })();
 
-    /**
-     * ------------------------------------------------------------------------
-     * Data Api implementation
-     * ------------------------------------------------------------------------
-     */
-
     $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
       event.preventDefault();
 

docs/dist/js/umd/dropdown.js

@@ -49,8 +49,8 @@
       SHOW: 'show' + EVENT_KEY,
       SHOWN: 'shown' + EVENT_KEY,
       CLICK: 'click' + EVENT_KEY,
-      CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY,
-      KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + '' + DATA_API_KEY
+      CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY,
+      KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + DATA_API_KEY
     };
 
     var ClassName = {
@@ -84,6 +84,14 @@
         this._addEventListeners();
       }
 
+      /**
+       * ------------------------------------------------------------------------
+       * Data Api implementation
+       * ------------------------------------------------------------------------
+       */
+
+      // getters
+
       _createClass(Dropdown, [{
         key: 'toggle',
 
@@ -136,19 +144,19 @@
           $(this._element).off(EVENT_KEY);
           this._element = null;
         }
-      }, {
-        key: '_addEventListeners',
 
         // private
 
+      }, {
+        key: '_addEventListeners',
         value: function _addEventListeners() {
           $(this._element).on(Event.CLICK, this.toggle);
         }
-      }], [{
-        key: '_jQueryInterface',
 
         // static
 
+      }], [{
+        key: '_jQueryInterface',
         value: function _jQueryInterface(config) {
           return this.each(function () {
             var data = $(this).data(DATA_KEY);
@@ -259,10 +267,7 @@
         }
       }, {
         key: 'VERSION',
-
-        // getters
-
-        get: function () {
+        get: function get() {
           return VERSION;
         }
       }]);
@@ -270,12 +275,6 @@
       return Dropdown;
     })();
 
-    /**
-     * ------------------------------------------------------------------------
-     * Data Api implementation
-     * ------------------------------------------------------------------------
-     */
-
     $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) {
       e.stopPropagation();
     });

docs/dist/js/umd/tab.js

@@ -49,7 +49,7 @@
       HIDDEN: 'hidden' + EVENT_KEY,
       SHOW: 'show' + EVENT_KEY,
       SHOWN: 'shown' + EVENT_KEY,
-      CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY
+      CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
     };
 
     var ClassName = {
@@ -84,6 +84,14 @@
         this._element = element;
       }
 
+      /**
+       * ------------------------------------------------------------------------
+       * Data Api implementation
+       * ------------------------------------------------------------------------
+       */
+
+      // getters
+
       _createClass(Tab, [{
         key: 'show',
 
@@ -159,11 +167,11 @@
           $.removeClass(this._element, DATA_KEY);
           this._element = null;
         }
-      }, {
-        key: '_activate',
 
         // private
 
+      }, {
+        key: '_activate',
         value: function _activate(element, container, callback) {
           var active = $(container).find(Selector.ACTIVE_CHILD)[0];
           var isTransitioning = callback && _Util['default'].supportsTransitionEnd() && (active && $(active).hasClass(ClassName.FADE) || !!$(container).find(Selector.FADE_CHILD)[0]);
@@ -228,11 +236,11 @@
             callback();
           }
         }
-      }], [{
-        key: '_jQueryInterface',
 
         // static
 
+      }], [{
+        key: '_jQueryInterface',
         value: function _jQueryInterface(config) {
           return this.each(function () {
             var $this = $(this);
@@ -250,10 +258,7 @@
         }
       }, {
         key: 'VERSION',
-
-        // getters
-
-        get: function () {
+        get: function get() {
           return VERSION;
         }
       }]);
@@ -261,12 +266,6 @@
       return Tab;
     })();
 
-    /**
-     * ------------------------------------------------------------------------
-     * Data Api implementation
-     * ------------------------------------------------------------------------
-     */
-
     $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
       event.preventDefault();
       Tab._jQueryInterface.call($(this), 'show');