rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'v4-dev' into colors-redux

Browse Source
This commit is contained in:
Mark Otto 2017-06-18 18:32:42 -07:00
commit 222eddda5e
36 changed files with 274 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/scss/_sidebar.scss
View File

@ -76,9 +76,11 @@
margin-left: -15px; margin-left: -15px;
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {
@supports (position: sticky) {
max-height: calc(100vh - 9rem); max-height: calc(100vh - 9rem);
overflow-y: auto; overflow-y: auto;
} }
}
// Override collapse behaviors // Override collapse behaviors
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {

3
build/postcss.config.js
View File

@ -35,7 +35,6 @@ module.exports = (ctx) => ({
'Android >= 4', 'Android >= 4',
'Opera >= 12' 'Opera >= 12'
] ]
}, }
'postcss-flexbugs-fixes': {}
} }
}) })

3
dist/css/bootstrap-grid.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
dist/css/bootstrap-reboot.min.css vendored
View File

@ -1,2 +1 @@
html{-webkit-box-sizing:border-box;box-sizing:border-box;font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}*,::after,::before{-webkit-box-sizing:inherit;box-sizing:inherit}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#292b2c;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#0275d8;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#014c8c;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}[role=button],a,area,button,input,label,select,summary,textarea{-ms-touch-action:manipulation;touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#636c72;text-align:left;caption-side:bottom}th{text-align:left}label{display:inline-block;margin-bottom:.5rem}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none!important} html{-webkit-box-sizing:border-box;box-sizing:border-box;font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}*,::after,::before{-webkit-box-sizing:inherit;box-sizing:inherit}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#292b2c;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#0275d8;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#014c8c;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}[role=button],a,area,button,input,label,select,summary,textarea{-ms-touch-action:manipulation;touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#636c72;text-align:left;caption-side:bottom}th{text-align:left}label{display:inline-block;margin-bottom:.5rem}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none!important}/*# sourceMappingURL=bootstrap-reboot.min.css.map */
/*# sourceMappingURL=bootstrap-reboot.min.css.map */

12
dist/css/bootstrap.css
View File

@ -4629,8 +4629,8 @@ tbody.collapse.show {
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
-webkit-box-flex: 1; -webkit-box-flex: 1;
-webkit-flex: 1 0 0; -webkit-flex: 1 0 0%;
-ms-flex: 1 0 0px; -ms-flex: 1 0 0%;
flex: 1 0 0%; flex: 1 0 0%;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-box-direction: normal; -webkit-box-direction: normal;
@ -4656,8 +4656,8 @@ tbody.collapse.show {
} }
.card-group .card { .card-group .card {
-webkit-box-flex: 1; -webkit-box-flex: 1;
-webkit-flex: 1 0 0; -webkit-flex: 1 0 0%;
-ms-flex: 1 0 0px; -ms-flex: 1 0 0%;
flex: 1 0 0%; flex: 1 0 0%;
} }
.card-group .card + .card { .card-group .card + .card {
@ -4806,6 +4806,7 @@ tbody.collapse.show {
.pagination-lg .page-link { .pagination-lg .page-link {
padding: 0.75rem 1.5rem; padding: 0.75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.5;
} }
.pagination-lg .page-item:first-child .page-link { .pagination-lg .page-item:first-child .page-link {
@ -4821,6 +4822,7 @@ tbody.collapse.show {
.pagination-sm .page-link { .pagination-sm .page-link {
padding: 0.25rem 0.5rem; padding: 0.25rem 0.5rem;
font-size: 0.875rem; font-size: 0.875rem;
line-height: 1.5;
} }
.pagination-sm .page-item:first-child .page-link { .pagination-sm .page-item:first-child .page-link {
@ -5091,7 +5093,7 @@ a.badge:focus, a.badge:hover {
-webkit-box-flex: 1; -webkit-box-flex: 1;
-webkit-flex: 1; -webkit-flex: 1;
-ms-flex: 1; -ms-flex: 1;
flex: 1 1 0%; flex: 1;
} }
.list-group { .list-group {

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

3
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

138
dist/js/bootstrap.js
View File

@ -50,9 +50,10 @@ var Util = function ($) {
MozTransition: 'transitionend', MozTransition: 'transitionend',
OTransition: 'oTransitionEnd otransitionend', OTransition: 'oTransitionEnd otransitionend',
transition: 'transitionend' transition: 'transitionend'
};
// shoutout AngusCroll (https://goo.gl/pxwQGp) // shoutout AngusCroll (https://goo.gl/pxwQGp)
};function toType(obj) { function toType(obj) {
return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase(); return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
} }
@ -66,8 +67,7 @@ var Util = function ($) {
delegateType: transition.end, delegateType: transition.end,
handle: function handle(event) { handle: function handle(event) {
if ($(event.target).is(this)) { if ($(event.target).is(this)) {
return event.handleObj.handler.apply(this, arguments // eslint-disable-line prefer-rest-params return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params
);
} }
return undefined; return undefined;
} }
@ -177,7 +177,7 @@ var Util = function ($) {
setTransitionEndSupport(); setTransitionEndSupport();
return Util; return Util;
}(jQuery }(jQuery);
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -186,7 +186,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Alert = function ($) { var Alert = function ($) {
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -216,6 +216,7 @@ var Util = function ($) {
ALERT: 'alert', ALERT: 'alert',
FADE: 'fade', FADE: 'fade',
SHOW: 'show' SHOW: 'show'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -223,7 +224,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Alert = function () { var Alert = function () {
function Alert(element) { function Alert(element) {
_classCallCheck(this, Alert); _classCallCheck(this, Alert);
@ -340,7 +340,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
$(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()) $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()));
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -348,7 +348,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Alert._jQueryInterface; $.fn[NAME] = Alert._jQueryInterface;
$.fn[NAME].Constructor = Alert; $.fn[NAME].Constructor = Alert;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;
@ -356,7 +356,7 @@ var Util = function ($) {
}; };
return Alert; return Alert;
}(jQuery }(jQuery);
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -365,7 +365,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Button = function ($) { var Button = function ($) {
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -397,6 +397,7 @@ var Util = function ($) {
var Event = { var Event = {
CLICK_DATA_API: 'click' + 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) FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY)
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -404,7 +405,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Button = function () { var Button = function () {
function Button(element) { function Button(element) {
_classCallCheck(this, Button); _classCallCheck(this, Button);
@ -510,7 +510,7 @@ var Util = function ($) {
}).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { }).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) {
var button = $(event.target).closest(Selector.BUTTON)[0]; var button = $(event.target).closest(Selector.BUTTON)[0];
$(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)); $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type));
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -518,7 +518,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Button._jQueryInterface; $.fn[NAME] = Button._jQueryInterface;
$.fn[NAME].Constructor = Button; $.fn[NAME].Constructor = Button;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;
@ -526,7 +526,7 @@ var Util = function ($) {
}; };
return Button; return Button;
}(jQuery }(jQuery);
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -535,7 +535,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Carousel = function ($) { var Carousel = function ($) {
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -607,6 +607,7 @@ var Util = function ($) {
INDICATORS: '.carousel-indicators', INDICATORS: '.carousel-indicators',
DATA_SLIDE: '[data-slide], [data-slide-to]', DATA_SLIDE: '[data-slide], [data-slide-to]',
DATA_RIDE: '[data-ride="carousel"]' DATA_RIDE: '[data-ride="carousel"]'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -614,7 +615,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Carousel = function () { var Carousel = function () {
function Carousel(element, config) { function Carousel(element, config) {
_classCallCheck(this, Carousel); _classCallCheck(this, Carousel);
@ -1017,7 +1017,7 @@ var Util = function ($) {
var $carousel = $(this); var $carousel = $(this);
Carousel._jQueryInterface.call($carousel, $carousel.data()); Carousel._jQueryInterface.call($carousel, $carousel.data());
}); });
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -1025,7 +1025,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Carousel._jQueryInterface; $.fn[NAME] = Carousel._jQueryInterface;
$.fn[NAME].Constructor = Carousel; $.fn[NAME].Constructor = Carousel;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;
@ -1033,7 +1033,7 @@ var Util = function ($) {
}; };
return Carousel; return Carousel;
}(jQuery }(jQuery);
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -1042,7 +1042,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Collapse = function ($) { var Collapse = function ($) {
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -1091,6 +1091,7 @@ var Util = function ($) {
var Selector = { var Selector = {
ACTIVES: '.show, .collapsing', ACTIVES: '.show, .collapsing',
DATA_TOGGLE: '[data-toggle="collapse"]' DATA_TOGGLE: '[data-toggle="collapse"]'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -1098,7 +1099,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Collapse = function () { var Collapse = function () {
function Collapse(element, config) { function Collapse(element, config) {
_classCallCheck(this, Collapse); _classCallCheck(this, Collapse);
@ -1280,8 +1280,8 @@ var Util = function ($) {
Collapse.prototype._getConfig = function _getConfig(config) { Collapse.prototype._getConfig = function _getConfig(config) {
config = $.extend({}, Default, config); config = $.extend({}, Default, config);
config.toggle = Boolean(config.toggle // coerce string values config.toggle = Boolean(config.toggle); // coerce string values
);Util.typeCheckConfig(NAME, config, DefaultType); Util.typeCheckConfig(NAME, config, DefaultType);
return config; return config;
}; };
@ -1378,7 +1378,7 @@ var Util = function ($) {
var config = data ? 'toggle' : $trigger.data(); var config = data ? 'toggle' : $trigger.data();
Collapse._jQueryInterface.call($target, config); Collapse._jQueryInterface.call($target, config);
}); });
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -1386,7 +1386,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Collapse._jQueryInterface; $.fn[NAME] = Collapse._jQueryInterface;
$.fn[NAME].Constructor = Collapse; $.fn[NAME].Constructor = Collapse;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;
@ -1394,7 +1394,7 @@ var Util = function ($) {
}; };
return Collapse; return Collapse;
}(jQuery }(jQuery);
/* global Popper */ /* global Popper */
@ -1405,7 +1405,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Dropdown = function ($) { var Dropdown = function ($) {
/** /**
* Check for Popper dependency * Check for Popper dependency
@ -1479,6 +1479,7 @@ var Util = function ($) {
placement: 'string', placement: 'string',
offset: '(number|string)', offset: '(number|string)',
flip: 'boolean' flip: 'boolean'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -1486,7 +1487,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Dropdown = function () { var Dropdown = function () {
function Dropdown(element, config) { function Dropdown(element, config) {
_classCallCheck(this, Dropdown); _classCallCheck(this, Dropdown);
@ -1812,7 +1812,7 @@ var Util = function ($) {
Dropdown._jQueryInterface.call($(this), 'toggle'); Dropdown._jQueryInterface.call($(this), 'toggle');
}).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { }).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) {
e.stopPropagation(); e.stopPropagation();
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -1820,7 +1820,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Dropdown._jQueryInterface; $.fn[NAME] = Dropdown._jQueryInterface;
$.fn[NAME].Constructor = Dropdown; $.fn[NAME].Constructor = Dropdown;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;
@ -1828,7 +1828,7 @@ var Util = function ($) {
}; };
return Dropdown; return Dropdown;
}(jQuery }(jQuery);
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -1837,7 +1837,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Modal = function ($) { var Modal = function ($) {
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -1897,6 +1897,7 @@ var Util = function ($) {
DATA_DISMISS: '[data-dismiss="modal"]', DATA_DISMISS: '[data-dismiss="modal"]',
FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top', FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
NAVBAR_TOGGLER: '.navbar-toggler' NAVBAR_TOGGLER: '.navbar-toggler'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -1904,7 +1905,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Modal = function () { var Modal = function () {
function Modal(element, config) { function Modal(element, config) {
_classCallCheck(this, Modal); _classCallCheck(this, Modal);
@ -2096,8 +2096,8 @@ var Util = function ($) {
Modal.prototype._enforceFocus = function _enforceFocus() { Modal.prototype._enforceFocus = function _enforceFocus() {
var _this14 = this; var _this14 = this;
$(document).off(Event.FOCUSIN // guard against infinite focus loop $(document).off(Event.FOCUSIN) // guard against infinite focus loop
).on(Event.FOCUSIN, function (event) { .on(Event.FOCUSIN, function (event) {
if (document !== event.target && _this14._element !== event.target && !$(_this14._element).has(event.target).length) { if (document !== event.target && _this14._element !== event.target && !$(_this14._element).has(event.target).length) {
_this14._element.focus(); _this14._element.focus();
} }
@ -2259,17 +2259,17 @@ var Util = function ($) {
var actualPadding = $(element)[0].style.paddingRight; var actualPadding = $(element)[0].style.paddingRight;
var calculatedPadding = $(element).css('padding-right'); var calculatedPadding = $(element).css('padding-right');
$(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this19._scrollbarWidth + 'px'); $(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this19._scrollbarWidth + 'px');
} });
// Adjust navbar-toggler margin // Adjust navbar-toggler margin
);$(Selector.NAVBAR_TOGGLER).each(function (index, element) { $(Selector.NAVBAR_TOGGLER).each(function (index, element) {
var actualMargin = $(element)[0].style.marginRight; var actualMargin = $(element)[0].style.marginRight;
var calculatedMargin = $(element).css('margin-right'); var calculatedMargin = $(element).css('margin-right');
$(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) + _this19._scrollbarWidth + 'px'); $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) + _this19._scrollbarWidth + 'px');
} });
// Adjust body padding // Adjust body padding
);var actualPadding = document.body.style.paddingRight; var actualPadding = document.body.style.paddingRight;
var calculatedPadding = $('body').css('padding-right'); var calculatedPadding = $('body').css('padding-right');
$('body').data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + 'px'); $('body').data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + 'px');
} }
@ -2282,18 +2282,18 @@ var Util = function ($) {
if (typeof padding !== 'undefined') { if (typeof padding !== 'undefined') {
$(element).css('padding-right', padding).removeData('padding-right'); $(element).css('padding-right', padding).removeData('padding-right');
} }
} });
// Restore navbar-toggler margin // Restore navbar-toggler margin
);$(Selector.NAVBAR_TOGGLER).each(function (index, element) { $(Selector.NAVBAR_TOGGLER).each(function (index, element) {
var margin = $(element).data('margin-right'); var margin = $(element).data('margin-right');
if (typeof margin !== 'undefined') { if (typeof margin !== 'undefined') {
$(element).css('margin-right', margin).removeData('margin-right'); $(element).css('margin-right', margin).removeData('margin-right');
} }
} });
// Restore body padding // Restore body padding
);var padding = $('body').data('padding-right'); var padding = $('body').data('padding-right');
if (typeof padding !== 'undefined') { if (typeof padding !== 'undefined') {
$('body').css('padding-right', padding).removeData('padding-right'); $('body').css('padding-right', padding).removeData('padding-right');
} }
@ -2383,7 +2383,7 @@ var Util = function ($) {
}); });
Modal._jQueryInterface.call($(target), config, this); Modal._jQueryInterface.call($(target), config, this);
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -2391,7 +2391,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Modal._jQueryInterface; $.fn[NAME] = Modal._jQueryInterface;
$.fn[NAME].Constructor = Modal; $.fn[NAME].Constructor = Modal;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;
@ -2399,7 +2399,7 @@ var Util = function ($) {
}; };
return Modal; return Modal;
}(jQuery }(jQuery);
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -2408,7 +2408,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var ScrollSpy = function ($) { var ScrollSpy = function ($) {
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -2461,6 +2461,7 @@ var Util = function ($) {
var OffsetMethod = { var OffsetMethod = {
OFFSET: 'offset', OFFSET: 'offset',
POSITION: 'position' POSITION: 'position'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -2468,7 +2469,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var ScrollSpy = function () { var ScrollSpy = function () {
function ScrollSpy(element, config) { function ScrollSpy(element, config) {
var _this21 = this; var _this21 = this;
@ -2633,10 +2633,10 @@ var Util = function ($) {
$link.addClass(ClassName.ACTIVE); $link.addClass(ClassName.ACTIVE);
} else { } else {
// Set triggered link as active // Set triggered link as active
$link.addClass(ClassName.ACTIVE $link.addClass(ClassName.ACTIVE);
// Set triggered links parents as active // Set triggered links parents as active
// With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
);$link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_LINKS + ', ' + Selector.LIST_ITEMS).addClass(ClassName.ACTIVE); $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_LINKS + ', ' + Selector.LIST_ITEMS).addClass(ClassName.ACTIVE);
} }
$(this._scrollElement).trigger(Event.ACTIVATE, { $(this._scrollElement).trigger(Event.ACTIVATE, {
@ -2697,7 +2697,7 @@ var Util = function ($) {
var $spy = $(scrollSpys[i]); var $spy = $(scrollSpys[i]);
ScrollSpy._jQueryInterface.call($spy, $spy.data()); ScrollSpy._jQueryInterface.call($spy, $spy.data());
} }
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -2705,7 +2705,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = ScrollSpy._jQueryInterface; $.fn[NAME] = ScrollSpy._jQueryInterface;
$.fn[NAME].Constructor = ScrollSpy; $.fn[NAME].Constructor = ScrollSpy;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;
@ -2713,7 +2713,7 @@ var Util = function ($) {
}; };
return ScrollSpy; return ScrollSpy;
}(jQuery }(jQuery);
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -2722,7 +2722,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Tab = function ($) { var Tab = function ($) {
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -2761,6 +2761,7 @@ var Util = function ($) {
DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]', DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
DROPDOWN_TOGGLE: '.dropdown-toggle', DROPDOWN_TOGGLE: '.dropdown-toggle',
DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active' DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -2768,7 +2769,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Tab = function () { var Tab = function () {
function Tab(element) { function Tab(element) {
_classCallCheck(this, Tab); _classCallCheck(this, Tab);
@ -2947,7 +2947,7 @@ var Util = function ($) {
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault(); event.preventDefault();
Tab._jQueryInterface.call($(this), 'show'); Tab._jQueryInterface.call($(this), 'show');
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -2955,7 +2955,7 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Tab._jQueryInterface; $.fn[NAME] = Tab._jQueryInterface;
$.fn[NAME].Constructor = Tab; $.fn[NAME].Constructor = Tab;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;
@ -2963,7 +2963,7 @@ var Util = function ($) {
}; };
return Tab; return Tab;
}(jQuery }(jQuery);
/* global Popper */ /* global Popper */
@ -2974,7 +2974,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Tooltip = function ($) { var Tooltip = function ($) {
/** /**
* Check for Popper dependency * Check for Popper dependency
@ -3069,6 +3069,7 @@ var Util = function ($) {
FOCUS: 'focus', FOCUS: 'focus',
CLICK: 'click', CLICK: 'click',
MANUAL: 'manual' MANUAL: 'manual'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -3076,7 +3077,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Tooltip = function () { var Tooltip = function () {
function Tooltip(element, config) { function Tooltip(element, config) {
_classCallCheck(this, Tooltip); _classCallCheck(this, Tooltip);
@ -3233,13 +3233,13 @@ var Util = function ($) {
} }
}); });
$(tip).addClass(ClassName.SHOW $(tip).addClass(ClassName.SHOW);
// if this is a touch-enabled device we add extra // if this is a touch-enabled device we add extra
// empty mouseover listeners to the body's immediate children; // empty mouseover listeners to the body's immediate children;
// only needed because of broken event delegation on iOS // only needed because of broken event delegation on iOS
// https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
);if ('ontouchstart' in document.documentElement) { if ('ontouchstart' in document.documentElement) {
$('body').children().on('mouseover', null, $.noop); $('body').children().on('mouseover', null, $.noop);
} }
@ -3293,11 +3293,11 @@ var Util = function ($) {
return; return;
} }
$(tip).removeClass(ClassName.SHOW $(tip).removeClass(ClassName.SHOW);
// if this is a touch-enabled device we remove the extra // if this is a touch-enabled device we remove the extra
// empty mouseover listeners we added for iOS support // empty mouseover listeners we added for iOS support
);if ('ontouchstart' in document.documentElement) { if ('ontouchstart' in document.documentElement) {
$('body').children().off('mouseover', null, $.noop); $('body').children().off('mouseover', null, $.noop);
} }
@ -3638,7 +3638,7 @@ var Util = function ($) {
}; };
return Tooltip; return Tooltip;
}(jQuery }(jQuery);
/** /**
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
@ -3647,7 +3647,7 @@ var Util = function ($) {
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
);var Popover = function ($) { var Popover = function ($) {
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -3695,6 +3695,7 @@ var Util = function ($) {
FOCUSOUT: 'focusout' + EVENT_KEY, FOCUSOUT: 'focusout' + EVENT_KEY,
MOUSEENTER: 'mouseenter' + EVENT_KEY, MOUSEENTER: 'mouseenter' + EVENT_KEY,
MOUSELEAVE: 'mouseleave' + EVENT_KEY MOUSELEAVE: 'mouseleave' + EVENT_KEY
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -3702,7 +3703,6 @@ var Util = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Popover = function (_Tooltip) { var Popover = function (_Tooltip) {
_inherits(Popover, _Tooltip); _inherits(Popover, _Tooltip);
@ -3727,10 +3727,10 @@ var Util = function ($) {
}; };
Popover.prototype.setContent = function setContent() { Popover.prototype.setContent = function setContent() {
var $tip = $(this.getTipElement() var $tip = $(this.getTipElement());
// we use append for html objects to maintain js events // we use append for html objects to maintain js events
);this.setElementContent($tip.find(Selector.TITLE), this.getTitle()); this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent()); this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW); $tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW);

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
docs/4.0/getting-started/download.md
View File

@ -15,7 +15,7 @@ toc: true
<a href="{{ site.download.dist }}" class="btn btn-bd-purple" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download Bootstrap');">Download Bootstrap</a> <a href="{{ site.download.dist }}" class="btn btn-bd-purple" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download Bootstrap');">Download Bootstrap</a>
## Source files ## Source files
**Want to compile Bootstrap with your project's asset pipeline?** Choose this option to download our source Sass, JavaScript, and documentation files. Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes), and [some setup]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/build-tools/#tooling-setup). **Want to compile Bootstrap with your project's asset pipeline?** Choose this option to download our source Sass, JavaScript, and documentation files. Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [some setup]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/build-tools/#tooling-setup).
<a href="{{ site.download.source }}" class="btn btn-bd-purple" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a> <a href="{{ site.download.source }}" class="btn btn-bd-purple" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a>
@ -30,7 +30,7 @@ Skip the download and use the Bootstrap CDN to deliver Bootstrap's compiled CSS
## Package managers ## Package managers
Pull in Bootstrap's **source files** into nearly any project with some of the most popular package managers. No matter the package manager, Bootstrap will **require a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes)** for a setup that matches our official compiled versions. Pull in Bootstrap's **source files** into nearly any project with some of the most popular package managers. No matter the package manager, Bootstrap will **require a Sass compiler and [Autoprefixer](https://github.com/postcss/autoprefixer)** for a setup that matches our official compiled versions.
### npm ### npm

2
docs/4.0/getting-started/webpack.md
View File

@ -61,7 +61,7 @@ First, create your own `_custom.scss` and use it to override the [built-in custo
@import "~bootstrap/scss/bootstrap"; @import "~bootstrap/scss/bootstrap";
{% endhighlight %} {% endhighlight %}
For Bootstrap to compile, make sure you install and use the required loaders: [sass-loader](https://github.com/webpack-contrib/sass-loader), [postcss-loader](https://github.com/postcss/postcss-loader) with [Autoprefixer](https://github.com/postcss/autoprefixer#webpack) and [postcss-flexbugs-fixes](https://github.com/luisrudge/postcss-flexbugs-fixes). With minimal setup, your webpack config should include this rule or similar: For Bootstrap to compile, make sure you install and use the required loaders: [sass-loader](https://github.com/webpack-contrib/sass-loader), [postcss-loader](https://github.com/postcss/postcss-loader) with [Autoprefixer](https://github.com/postcss/autoprefixer#webpack). With minimal setup, your webpack config should include this rule or similar:
{% highlight js %} {% highlight js %}
... ...

6
js/dist/alert.js vendored
View File

@ -39,6 +39,7 @@ var Alert = function ($) {
ALERT: 'alert', ALERT: 'alert',
FADE: 'fade', FADE: 'fade',
SHOW: 'show' SHOW: 'show'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -46,7 +47,6 @@ var Alert = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Alert = function () { var Alert = function () {
function Alert(element) { function Alert(element) {
_classCallCheck(this, Alert); _classCallCheck(this, Alert);
@ -163,7 +163,7 @@ var Alert = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
$(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()) $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()));
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -171,7 +171,7 @@ var Alert = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Alert._jQueryInterface; $.fn[NAME] = Alert._jQueryInterface;
$.fn[NAME].Constructor = Alert; $.fn[NAME].Constructor = Alert;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;

2
js/dist/alert.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
js/dist/button.js vendored
View File

@ -41,6 +41,7 @@ var Button = function ($) {
var Event = { var Event = {
CLICK_DATA_API: 'click' + 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) FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY)
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -48,7 +49,6 @@ var Button = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Button = function () { var Button = function () {
function Button(element) { function Button(element) {
_classCallCheck(this, Button); _classCallCheck(this, Button);
@ -154,7 +154,7 @@ var Button = function ($) {
}).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { }).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) {
var button = $(event.target).closest(Selector.BUTTON)[0]; var button = $(event.target).closest(Selector.BUTTON)[0];
$(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)); $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type));
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -162,7 +162,7 @@ var Button = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Button._jQueryInterface; $.fn[NAME] = Button._jQueryInterface;
$.fn[NAME].Constructor = Button; $.fn[NAME].Constructor = Button;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;

2
js/dist/button.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
js/dist/carousel.js vendored
View File

@ -83,6 +83,7 @@ var Carousel = function ($) {
INDICATORS: '.carousel-indicators', INDICATORS: '.carousel-indicators',
DATA_SLIDE: '[data-slide], [data-slide-to]', DATA_SLIDE: '[data-slide], [data-slide-to]',
DATA_RIDE: '[data-ride="carousel"]' DATA_RIDE: '[data-ride="carousel"]'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -90,7 +91,6 @@ var Carousel = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Carousel = function () { var Carousel = function () {
function Carousel(element, config) { function Carousel(element, config) {
_classCallCheck(this, Carousel); _classCallCheck(this, Carousel);
@ -493,7 +493,7 @@ var Carousel = function ($) {
var $carousel = $(this); var $carousel = $(this);
Carousel._jQueryInterface.call($carousel, $carousel.data()); Carousel._jQueryInterface.call($carousel, $carousel.data());
}); });
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -501,7 +501,7 @@ var Carousel = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Carousel._jQueryInterface; $.fn[NAME] = Carousel._jQueryInterface;
$.fn[NAME].Constructor = Carousel; $.fn[NAME].Constructor = Carousel;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;

2
js/dist/carousel.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
js/dist/collapse.js vendored
View File

@ -60,6 +60,7 @@ var Collapse = function ($) {
var Selector = { var Selector = {
ACTIVES: '.show, .collapsing', ACTIVES: '.show, .collapsing',
DATA_TOGGLE: '[data-toggle="collapse"]' DATA_TOGGLE: '[data-toggle="collapse"]'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -67,7 +68,6 @@ var Collapse = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Collapse = function () { var Collapse = function () {
function Collapse(element, config) { function Collapse(element, config) {
_classCallCheck(this, Collapse); _classCallCheck(this, Collapse);
@ -249,8 +249,8 @@ var Collapse = function ($) {
Collapse.prototype._getConfig = function _getConfig(config) { Collapse.prototype._getConfig = function _getConfig(config) {
config = $.extend({}, Default, config); config = $.extend({}, Default, config);
config.toggle = Boolean(config.toggle // coerce string values config.toggle = Boolean(config.toggle); // coerce string values
);Util.typeCheckConfig(NAME, config, DefaultType); Util.typeCheckConfig(NAME, config, DefaultType);
return config; return config;
}; };
@ -347,7 +347,7 @@ var Collapse = function ($) {
var config = data ? 'toggle' : $trigger.data(); var config = data ? 'toggle' : $trigger.data();
Collapse._jQueryInterface.call($target, config); Collapse._jQueryInterface.call($target, config);
}); });
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -355,7 +355,7 @@ var Collapse = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Collapse._jQueryInterface; $.fn[NAME] = Collapse._jQueryInterface;
$.fn[NAME].Constructor = Collapse; $.fn[NAME].Constructor = Collapse;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;

2
js/dist/collapse.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
js/dist/dropdown.js vendored
View File

@ -85,6 +85,7 @@ var Dropdown = function ($) {
placement: 'string', placement: 'string',
offset: '(number|string)', offset: '(number|string)',
flip: 'boolean' flip: 'boolean'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -92,7 +93,6 @@ var Dropdown = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Dropdown = function () { var Dropdown = function () {
function Dropdown(element, config) { function Dropdown(element, config) {
_classCallCheck(this, Dropdown); _classCallCheck(this, Dropdown);
@ -418,7 +418,7 @@ var Dropdown = function ($) {
Dropdown._jQueryInterface.call($(this), 'toggle'); Dropdown._jQueryInterface.call($(this), 'toggle');
}).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { }).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) {
e.stopPropagation(); e.stopPropagation();
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -426,7 +426,7 @@ var Dropdown = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Dropdown._jQueryInterface; $.fn[NAME] = Dropdown._jQueryInterface;
$.fn[NAME].Constructor = Dropdown; $.fn[NAME].Constructor = Dropdown;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;

2
js/dist/dropdown.js.map vendored
View File

File diff suppressed because one or more lines are too long

26
js/dist/modal.js vendored
View File

@ -71,6 +71,7 @@ var Modal = function ($) {
DATA_DISMISS: '[data-dismiss="modal"]', DATA_DISMISS: '[data-dismiss="modal"]',
FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top', FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
NAVBAR_TOGGLER: '.navbar-toggler' NAVBAR_TOGGLER: '.navbar-toggler'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -78,7 +79,6 @@ var Modal = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Modal = function () { var Modal = function () {
function Modal(element, config) { function Modal(element, config) {
_classCallCheck(this, Modal); _classCallCheck(this, Modal);
@ -270,8 +270,8 @@ var Modal = function ($) {
Modal.prototype._enforceFocus = function _enforceFocus() { Modal.prototype._enforceFocus = function _enforceFocus() {
var _this4 = this; var _this4 = this;
$(document).off(Event.FOCUSIN // guard against infinite focus loop $(document).off(Event.FOCUSIN) // guard against infinite focus loop
).on(Event.FOCUSIN, function (event) { .on(Event.FOCUSIN, function (event) {
if (document !== event.target && _this4._element !== event.target && !$(_this4._element).has(event.target).length) { if (document !== event.target && _this4._element !== event.target && !$(_this4._element).has(event.target).length) {
_this4._element.focus(); _this4._element.focus();
} }
@ -433,17 +433,17 @@ var Modal = function ($) {
var actualPadding = $(element)[0].style.paddingRight; var actualPadding = $(element)[0].style.paddingRight;
var calculatedPadding = $(element).css('padding-right'); var calculatedPadding = $(element).css('padding-right');
$(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this9._scrollbarWidth + 'px'); $(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this9._scrollbarWidth + 'px');
} });
// Adjust navbar-toggler margin // Adjust navbar-toggler margin
);$(Selector.NAVBAR_TOGGLER).each(function (index, element) { $(Selector.NAVBAR_TOGGLER).each(function (index, element) {
var actualMargin = $(element)[0].style.marginRight; var actualMargin = $(element)[0].style.marginRight;
var calculatedMargin = $(element).css('margin-right'); var calculatedMargin = $(element).css('margin-right');
$(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) + _this9._scrollbarWidth + 'px'); $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) + _this9._scrollbarWidth + 'px');
} });
// Adjust body padding // Adjust body padding
);var actualPadding = document.body.style.paddingRight; var actualPadding = document.body.style.paddingRight;
var calculatedPadding = $('body').css('padding-right'); var calculatedPadding = $('body').css('padding-right');
$('body').data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + 'px'); $('body').data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + 'px');
} }
@ -456,18 +456,18 @@ var Modal = function ($) {
if (typeof padding !== 'undefined') { if (typeof padding !== 'undefined') {
$(element).css('padding-right', padding).removeData('padding-right'); $(element).css('padding-right', padding).removeData('padding-right');
} }
} });
// Restore navbar-toggler margin // Restore navbar-toggler margin
);$(Selector.NAVBAR_TOGGLER).each(function (index, element) { $(Selector.NAVBAR_TOGGLER).each(function (index, element) {
var margin = $(element).data('margin-right'); var margin = $(element).data('margin-right');
if (typeof margin !== 'undefined') { if (typeof margin !== 'undefined') {
$(element).css('margin-right', margin).removeData('margin-right'); $(element).css('margin-right', margin).removeData('margin-right');
} }
} });
// Restore body padding // Restore body padding
);var padding = $('body').data('padding-right'); var padding = $('body').data('padding-right');
if (typeof padding !== 'undefined') { if (typeof padding !== 'undefined') {
$('body').css('padding-right', padding).removeData('padding-right'); $('body').css('padding-right', padding).removeData('padding-right');
} }
@ -557,7 +557,7 @@ var Modal = function ($) {
}); });
Modal._jQueryInterface.call($(target), config, this); Modal._jQueryInterface.call($(target), config, this);
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -565,7 +565,7 @@ var Modal = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Modal._jQueryInterface; $.fn[NAME] = Modal._jQueryInterface;
$.fn[NAME].Constructor = Modal; $.fn[NAME].Constructor = Modal;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;

2
js/dist/modal.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
js/dist/popover.js vendored
View File

@ -63,6 +63,7 @@ var Popover = function ($) {
FOCUSOUT: 'focusout' + EVENT_KEY, FOCUSOUT: 'focusout' + EVENT_KEY,
MOUSEENTER: 'mouseenter' + EVENT_KEY, MOUSEENTER: 'mouseenter' + EVENT_KEY,
MOUSELEAVE: 'mouseleave' + EVENT_KEY MOUSELEAVE: 'mouseleave' + EVENT_KEY
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -70,7 +71,6 @@ var Popover = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Popover = function (_Tooltip) { var Popover = function (_Tooltip) {
_inherits(Popover, _Tooltip); _inherits(Popover, _Tooltip);
@ -95,10 +95,10 @@ var Popover = function ($) {
}; };
Popover.prototype.setContent = function setContent() { Popover.prototype.setContent = function setContent() {
var $tip = $(this.getTipElement() var $tip = $(this.getTipElement());
// we use append for html objects to maintain js events // we use append for html objects to maintain js events
);this.setElementContent($tip.find(Selector.TITLE), this.getTitle()); this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent()); this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW); $tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW);

2
js/dist/popover.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
js/dist/scrollspy.js vendored
View File

@ -64,6 +64,7 @@ var ScrollSpy = function ($) {
var OffsetMethod = { var OffsetMethod = {
OFFSET: 'offset', OFFSET: 'offset',
POSITION: 'position' POSITION: 'position'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -71,7 +72,6 @@ var ScrollSpy = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var ScrollSpy = function () { var ScrollSpy = function () {
function ScrollSpy(element, config) { function ScrollSpy(element, config) {
var _this = this; var _this = this;
@ -236,10 +236,10 @@ var ScrollSpy = function ($) {
$link.addClass(ClassName.ACTIVE); $link.addClass(ClassName.ACTIVE);
} else { } else {
// Set triggered link as active // Set triggered link as active
$link.addClass(ClassName.ACTIVE $link.addClass(ClassName.ACTIVE);
// Set triggered links parents as active // Set triggered links parents as active
// With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
);$link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_LINKS + ', ' + Selector.LIST_ITEMS).addClass(ClassName.ACTIVE); $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_LINKS + ', ' + Selector.LIST_ITEMS).addClass(ClassName.ACTIVE);
} }
$(this._scrollElement).trigger(Event.ACTIVATE, { $(this._scrollElement).trigger(Event.ACTIVATE, {
@ -300,7 +300,7 @@ var ScrollSpy = function ($) {
var $spy = $(scrollSpys[i]); var $spy = $(scrollSpys[i]);
ScrollSpy._jQueryInterface.call($spy, $spy.data()); ScrollSpy._jQueryInterface.call($spy, $spy.data());
} }
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -308,7 +308,7 @@ var ScrollSpy = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = ScrollSpy._jQueryInterface; $.fn[NAME] = ScrollSpy._jQueryInterface;
$.fn[NAME].Constructor = ScrollSpy; $.fn[NAME].Constructor = ScrollSpy;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;

2
js/dist/scrollspy.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
js/dist/tab.js vendored
View File

@ -48,6 +48,7 @@ var Tab = function ($) {
DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]', DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
DROPDOWN_TOGGLE: '.dropdown-toggle', DROPDOWN_TOGGLE: '.dropdown-toggle',
DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active' DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -55,7 +56,6 @@ var Tab = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Tab = function () { var Tab = function () {
function Tab(element) { function Tab(element) {
_classCallCheck(this, Tab); _classCallCheck(this, Tab);
@ -234,7 +234,7 @@ var Tab = function ($) {
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault(); event.preventDefault();
Tab._jQueryInterface.call($(this), 'show'); Tab._jQueryInterface.call($(this), 'show');
} });
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -242,7 +242,7 @@ var Tab = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
);$.fn[NAME] = Tab._jQueryInterface; $.fn[NAME] = Tab._jQueryInterface;
$.fn[NAME].Constructor = Tab; $.fn[NAME].Constructor = Tab;
$.fn[NAME].noConflict = function () { $.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT; $.fn[NAME] = JQUERY_NO_CONFLICT;

2
js/dist/tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
js/dist/tooltip.js vendored
View File

@ -106,6 +106,7 @@ var Tooltip = function ($) {
FOCUS: 'focus', FOCUS: 'focus',
CLICK: 'click', CLICK: 'click',
MANUAL: 'manual' MANUAL: 'manual'
};
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
@ -113,7 +114,6 @@ var Tooltip = function ($) {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
};
var Tooltip = function () { var Tooltip = function () {
function Tooltip(element, config) { function Tooltip(element, config) {
_classCallCheck(this, Tooltip); _classCallCheck(this, Tooltip);
@ -270,13 +270,13 @@ var Tooltip = function ($) {
} }
}); });
$(tip).addClass(ClassName.SHOW $(tip).addClass(ClassName.SHOW);
// if this is a touch-enabled device we add extra // if this is a touch-enabled device we add extra
// empty mouseover listeners to the body's immediate children; // empty mouseover listeners to the body's immediate children;
// only needed because of broken event delegation on iOS // only needed because of broken event delegation on iOS
// https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
);if ('ontouchstart' in document.documentElement) { if ('ontouchstart' in document.documentElement) {
$('body').children().on('mouseover', null, $.noop); $('body').children().on('mouseover', null, $.noop);
} }
@ -330,11 +330,11 @@ var Tooltip = function ($) {
return; return;
} }
$(tip).removeClass(ClassName.SHOW $(tip).removeClass(ClassName.SHOW);
// if this is a touch-enabled device we remove the extra // if this is a touch-enabled device we remove the extra
// empty mouseover listeners we added for iOS support // empty mouseover listeners we added for iOS support
);if ('ontouchstart' in document.documentElement) { if ('ontouchstart' in document.documentElement) {
$('body').children().off('mouseover', null, $.noop); $('body').children().off('mouseover', null, $.noop);
} }

2
js/dist/tooltip.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
js/dist/util.js vendored
View File

@ -22,9 +22,10 @@ var Util = function ($) {
MozTransition: 'transitionend', MozTransition: 'transitionend',
OTransition: 'oTransitionEnd otransitionend', OTransition: 'oTransitionEnd otransitionend',
transition: 'transitionend' transition: 'transitionend'
};
// shoutout AngusCroll (https://goo.gl/pxwQGp) // shoutout AngusCroll (https://goo.gl/pxwQGp)
};function toType(obj) { function toType(obj) {
return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase(); return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
} }
@ -38,8 +39,7 @@ var Util = function ($) {
delegateType: transition.end, delegateType: transition.end,
handle: function handle(event) { handle: function handle(event) {
if ($(event.target).is(this)) { if ($(event.target).is(this)) {
return event.handleObj.handler.apply(this, arguments // eslint-disable-line prefer-rest-params return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params
);
} }
return undefined; return undefined;
} }

2
js/dist/util.js.map vendored
View File

File diff suppressed because one or more lines are too long

1
package.json
View File

@ -86,7 +86,6 @@
"npm-run-all": "^4.0.2", "npm-run-all": "^4.0.2",
"phantomjs-prebuilt": "^2.1.14", "phantomjs-prebuilt": "^2.1.14",
"postcss-cli": "^4.0.0", "postcss-cli": "^4.0.0",
"postcss-flexbugs-fixes": "^3.0.0",
"qunit-phantomjs-runner": "^2.3.0", "qunit-phantomjs-runner": "^2.3.0",
"qunitjs": "^2.3.2", "qunitjs": "^2.3.2",
"shelljs": "^0.7.7", "shelljs": "^0.7.7",

4
scss/_card.scss
View File

@ -174,7 +174,7 @@
.card { .card {
display: flex; display: flex;
flex: 1 0 0; flex: 1 0 0%;
flex-direction: column; flex-direction: column;
margin-right: $card-deck-margin; margin-right: $card-deck-margin;
margin-left: $card-deck-margin; margin-left: $card-deck-margin;
@ -193,7 +193,7 @@
flex-flow: row wrap; flex-flow: row wrap;
.card { .card {
flex: 1 0 0; flex: 1 0 0%;
+ .card { + .card {
margin-left: 0; margin-left: 0;