update bd-dev and remove hotfix

This commit is contained in:
Mario Vavti 2017-04-05 14:12:18 +02:00
parent 50612565e9
commit fb31f629c6
8 changed files with 64 additions and 60 deletions

File diff suppressed because one or more lines are too long

View File

@ -2151,7 +2151,7 @@ pre code {
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
padding: 0.5rem 0.75rem; padding: 0.5rem 1rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.25; line-height: 1.25;
color: #464a4c; color: #464a4c;
@ -2230,8 +2230,8 @@ select.form-control:focus::-ms-value {
} }
.col-form-label-lg { .col-form-label-lg {
padding-top: calc(0.75rem - 1px * 2); padding-top: calc(0.5rem - 1px * 2);
padding-bottom: calc(0.75rem - 1px * 2); padding-bottom: calc(0.5rem - 1px * 2);
font-size: 1.25rem; font-size: 1.25rem;
} }
@ -2271,27 +2271,29 @@ select.form-control:focus::-ms-value {
.input-group-sm > .input-group-btn > .btn { .input-group-sm > .input-group-btn > .btn {
padding: 0.25rem 0.5rem; padding: 0.25rem 0.5rem;
font-size: 0.875rem; font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem; border-radius: 0.2rem;
} }
select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.form-control:not([size]):not([multiple]), select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.form-control:not([size]):not([multiple]),
.input-group-sm > select.input-group-addon:not([size]):not([multiple]), .input-group-sm > select.input-group-addon:not([size]):not([multiple]),
.input-group-sm > .input-group-btn > select.btn:not([size]):not([multiple]) { .input-group-sm > .input-group-btn > select.btn:not([size]):not([multiple]) {
height: 1.8125rem; height: calc(1.8125rem + 2px);
} }
.form-control-lg, .input-group-lg > .form-control, .form-control-lg, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
padding: 0.75rem 1.5rem; padding: 0.5rem 1rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem; border-radius: 0.3rem;
} }
select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.form-control:not([size]):not([multiple]), select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.form-control:not([size]):not([multiple]),
.input-group-lg > select.input-group-addon:not([size]):not([multiple]), .input-group-lg > select.input-group-addon:not([size]):not([multiple]),
.input-group-lg > .input-group-btn > select.btn:not([size]):not([multiple]) { .input-group-lg > .input-group-btn > select.btn:not([size]):not([multiple]) {
height: 3.166667rem; height: calc(2.875rem + 2px);
} }
.form-group { .form-group {
@ -2348,7 +2350,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.form-control-success, .form-control-success,
.form-control-warning, .form-control-warning,
.form-control-danger { .form-control-danger {
padding-right: 2.25rem; padding-right: 3rem;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center right 0.5625rem; background-position: center right 0.5625rem;
-webkit-background-size: 1.125rem 1.125rem; -webkit-background-size: 1.125rem 1.125rem;
@ -2553,7 +2555,6 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.btn { .btn {
display: inline-block; display: inline-block;
font-weight: normal; font-weight: normal;
line-height: 1.25;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: middle;
@ -2564,6 +2565,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
border: 1px solid transparent; border: 1px solid transparent;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.25;
border-radius: 0.25rem; border-radius: 0.25rem;
-webkit-transition: all 0.2s ease-in-out; -webkit-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out; -o-transition: all 0.2s ease-in-out;
@ -2987,14 +2989,16 @@ fieldset[disabled] a.btn {
} }
.btn-lg, .btn-group-lg > .btn { .btn-lg, .btn-group-lg > .btn {
padding: 0.75rem 1.5rem; padding: 0.5rem 1rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem; border-radius: 0.3rem;
} }
.btn-sm, .btn-group-sm > .btn { .btn-sm, .btn-group-sm > .btn {
padding: 0.25rem 0.5rem; padding: 0.25rem 0.5rem;
font-size: 0.875rem; font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem; border-radius: 0.2rem;
} }
@ -3291,8 +3295,8 @@ tbody.collapse.show {
} }
.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split { .btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
padding-right: 1.125rem; padding-right: 0.75rem;
padding-left: 1.125rem; padding-left: 0.75rem;
} }
.btn-group-vertical { .btn-group-vertical {
@ -3416,7 +3420,7 @@ tbody.collapse.show {
} }
.input-group-addon { .input-group-addon {
padding: 0.5rem 0.75rem; padding: 0.5rem 1rem;
margin-bottom: 0; margin-bottom: 0;
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
@ -3439,7 +3443,7 @@ tbody.collapse.show {
.input-group-addon.form-control-lg, .input-group-addon.form-control-lg,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .input-group-addon.btn { .input-group-lg > .input-group-btn > .input-group-addon.btn {
padding: 0.75rem 1.5rem; padding: 0.5rem 1rem;
font-size: 1.25rem; font-size: 1.25rem;
border-radius: 0.3rem; border-radius: 0.3rem;
} }
@ -5682,6 +5686,7 @@ button.close {
padding: 8px 14px; padding: 8px 14px;
margin-bottom: 0; margin-bottom: 0;
font-size: 1rem; font-size: 1rem;
color: inherit;
background-color: #f7f7f7; background-color: #f7f7f7;
border-bottom: 1px solid #ebebeb; border-bottom: 1px solid #ebebeb;
border-top-left-radius: calc(0.3rem - 1px); border-top-left-radius: calc(0.3rem - 1px);
@ -5694,6 +5699,7 @@ button.close {
.popover-content { .popover-content {
padding: 9px 14px; padding: 9px 14px;
color: #292b2c;
} }
.popover::before, .popover::before,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -631,10 +631,9 @@ var Carousel = function ($) {
// public // public
Carousel.prototype.next = function next() { Carousel.prototype.next = function next() {
if (this._isSliding) { if (!this._isSliding) {
throw new Error('Carousel is sliding');
}
this._slide(Direction.NEXT); this._slide(Direction.NEXT);
}
}; };
Carousel.prototype.nextWhenVisible = function nextWhenVisible() { Carousel.prototype.nextWhenVisible = function nextWhenVisible() {
@ -645,10 +644,9 @@ var Carousel = function ($) {
}; };
Carousel.prototype.prev = function prev() { Carousel.prototype.prev = function prev() {
if (this._isSliding) { if (!this._isSliding) {
throw new Error('Carousel is sliding');
}
this._slide(Direction.PREV); this._slide(Direction.PREV);
}
}; };
Carousel.prototype.pause = function pause(event) { Carousel.prototype.pause = function pause(event) {
@ -1117,11 +1115,7 @@ var Collapse = function ($) {
Collapse.prototype.show = function show() { Collapse.prototype.show = function show() {
var _this6 = this; var _this6 = this;
if (this._isTransitioning) { if (this._isTransitioning || $(this._element).hasClass(ClassName.SHOW)) {
throw new Error('Collapse is transitioning');
}
if ($(this._element).hasClass(ClassName.SHOW)) {
return; return;
} }
@ -1194,11 +1188,7 @@ var Collapse = function ($) {
Collapse.prototype.hide = function hide() { Collapse.prototype.hide = function hide() {
var _this7 = this; var _this7 = this;
if (this._isTransitioning) { if (this._isTransitioning || !$(this._element).hasClass(ClassName.SHOW)) {
throw new Error('Collapse is transitioning');
}
if (!$(this._element).hasClass(ClassName.SHOW)) {
return; return;
} }
@ -1344,7 +1334,7 @@ var Collapse = function ($) {
*/ */
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
if (/input|textarea/i.test(event.target.tagName)) { if (!/input|textarea/i.test(event.target.tagName)) {
event.preventDefault(); event.preventDefault();
} }
@ -1743,7 +1733,6 @@ var Modal = function ($) {
this._isShown = false; this._isShown = false;
this._isBodyOverflowing = false; this._isBodyOverflowing = false;
this._ignoreBackdropClick = false; this._ignoreBackdropClick = false;
this._isTransitioning = false;
this._originalBodyPadding = 0; this._originalBodyPadding = 0;
this._scrollbarWidth = 0; this._scrollbarWidth = 0;
} }
@ -1760,12 +1749,13 @@ var Modal = function ($) {
var _this9 = this; var _this9 = this;
if (this._isTransitioning) { if (this._isTransitioning) {
throw new Error('Modal is transitioning'); return;
} }
if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) { if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) {
this._isTransitioning = true; this._isTransitioning = true;
} }
var showEvent = $.Event(Event.SHOW, { var showEvent = $.Event(Event.SHOW, {
relatedTarget: relatedTarget relatedTarget: relatedTarget
}); });
@ -1810,16 +1800,18 @@ var Modal = function ($) {
event.preventDefault(); event.preventDefault();
} }
if (this._isTransitioning) { if (this._isTransitioning || !this._isShown) {
throw new Error('Modal is transitioning'); return;
} }
var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE); var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE);
if (transition) { if (transition) {
this._isTransitioning = true; this._isTransitioning = true;
} }
var hideEvent = $.Event(Event.HIDE); var hideEvent = $.Event(Event.HIDE);
$(this._element).trigger(hideEvent); $(this._element).trigger(hideEvent);
if (!this._isShown || hideEvent.isDefaultPrevented()) { if (!this._isShown || hideEvent.isDefaultPrevented()) {
@ -1839,6 +1831,7 @@ var Modal = function ($) {
$(this._dialog).off(Event.MOUSEDOWN_DISMISS); $(this._dialog).off(Event.MOUSEDOWN_DISMISS);
if (transition) { if (transition) {
$(this._element).one(Util.TRANSITION_END, function (event) { $(this._element).one(Util.TRANSITION_END, function (event) {
return _this10._hideModal(event); return _this10._hideModal(event);
}).emulateTransitionEnd(TRANSITION_DURATION); }).emulateTransitionEnd(TRANSITION_DURATION);
@ -1959,7 +1952,7 @@ var Modal = function ($) {
var _this15 = this; var _this15 = this;
this._element.style.display = 'none'; this._element.style.display = 'none';
this._element.setAttribute('aria-hidden', 'true'); this._element.setAttribute('aria-hidden', true);
this._isTransitioning = false; this._isTransitioning = false;
this._showBackdrop(function () { this._showBackdrop(function () {
$(document.body).removeClass(ClassName.OPEN); $(document.body).removeClass(ClassName.OPEN);
@ -2794,6 +2787,7 @@ var Tooltip = function ($) {
var JQUERY_NO_CONFLICT = $.fn[NAME]; var JQUERY_NO_CONFLICT = $.fn[NAME];
var TRANSITION_DURATION = 150; var TRANSITION_DURATION = 150;
var CLASS_PREFIX = 'bs-tether'; var CLASS_PREFIX = 'bs-tether';
var TETHER_PREFIX_REGEX = new RegExp('(^|\\s)' + CLASS_PREFIX + '\\S+', 'g');
var Default = { var Default = {
animation: true, animation: true,
@ -2885,7 +2879,6 @@ var Tooltip = function ($) {
this._timeout = 0; this._timeout = 0;
this._hoverState = ''; this._hoverState = '';
this._activeTrigger = {}; this._activeTrigger = {};
this._isTransitioning = false;
this._tether = null; this._tether = null;
// protected // protected
@ -2974,9 +2967,6 @@ var Tooltip = function ($) {
var showEvent = $.Event(this.constructor.Event.SHOW); var showEvent = $.Event(this.constructor.Event.SHOW);
if (this.isWithContent() && this._isEnabled) { if (this.isWithContent() && this._isEnabled) {
if (this._isTransitioning) {
throw new Error('Tooltip is transitioning');
}
$(this.element).trigger(showEvent); $(this.element).trigger(showEvent);
var isInTheDom = $.contains(this.element.ownerDocument.documentElement, this.element); var isInTheDom = $.contains(this.element.ownerDocument.documentElement, this.element);
@ -3003,7 +2993,11 @@ var Tooltip = function ($) {
var container = this.config.container === false ? document.body : $(this.config.container); var container = this.config.container === false ? document.body : $(this.config.container);
$(tip).data(this.constructor.DATA_KEY, this).appendTo(container); $(tip).data(this.constructor.DATA_KEY, this);
if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) {
$(tip).appendTo(container);
}
$(this.element).trigger(this.constructor.Event.INSERTED); $(this.element).trigger(this.constructor.Event.INSERTED);
@ -3026,7 +3020,6 @@ var Tooltip = function ($) {
var complete = function complete() { var complete = function complete() {
var prevHoverState = _this22._hoverState; var prevHoverState = _this22._hoverState;
_this22._hoverState = null; _this22._hoverState = null;
_this22._isTransitioning = false;
$(_this22.element).trigger(_this22.constructor.Event.SHOWN); $(_this22.element).trigger(_this22.constructor.Event.SHOWN);
@ -3036,7 +3029,6 @@ var Tooltip = function ($) {
}; };
if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) {
this._isTransitioning = true;
$(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(Tooltip._TRANSITION_DURATION); $(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(Tooltip._TRANSITION_DURATION);
return; return;
} }
@ -3050,17 +3042,14 @@ var Tooltip = function ($) {
var tip = this.getTipElement(); var tip = this.getTipElement();
var hideEvent = $.Event(this.constructor.Event.HIDE); var hideEvent = $.Event(this.constructor.Event.HIDE);
if (this._isTransitioning) {
throw new Error('Tooltip is transitioning');
}
var complete = function complete() { var complete = function complete() {
if (_this23._hoverState !== HoverState.SHOW && tip.parentNode) { if (_this23._hoverState !== HoverState.SHOW && tip.parentNode) {
tip.parentNode.removeChild(tip); tip.parentNode.removeChild(tip);
} }
_this23._cleanTipClass();
_this23.element.removeAttribute('aria-describedby'); _this23.element.removeAttribute('aria-describedby');
$(_this23.element).trigger(_this23.constructor.Event.HIDDEN); $(_this23.element).trigger(_this23.constructor.Event.HIDDEN);
_this23._isTransitioning = false;
_this23.cleanupTether(); _this23.cleanupTether();
if (callback) { if (callback) {
@ -3081,7 +3070,7 @@ var Tooltip = function ($) {
this._activeTrigger[Trigger.HOVER] = false; this._activeTrigger[Trigger.HOVER] = false;
if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) {
this._isTransitioning = true;
$(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION); $(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION);
} else { } else {
complete(); complete();
@ -3148,6 +3137,14 @@ var Tooltip = function ($) {
return AttachmentMap[placement.toUpperCase()]; return AttachmentMap[placement.toUpperCase()];
}; };
Tooltip.prototype._cleanTipClass = function _cleanTipClass() {
var $tip = $(this.getTipElement());
var tabClass = $tip.attr('class').match(TETHER_PREFIX_REGEX);
if (tabClass !== null && tabClass.length > 0) {
$tip.removeClass(tabClass.join(''));
}
};
Tooltip.prototype._setListeners = function _setListeners() { Tooltip.prototype._setListeners = function _setListeners() {
var _this24 = this; var _this24 = this;
@ -3281,6 +3278,14 @@ var Tooltip = function ($) {
}; };
} }
if (config.title && typeof config.title === 'number') {
config.title = config.title.toString();
}
if (config.content && typeof config.content === 'number') {
config.content = config.content.toString();
}
Util.typeCheckConfig(NAME, config, this.constructor.DefaultType); Util.typeCheckConfig(NAME, config, this.constructor.DefaultType);
return config; return config;

File diff suppressed because one or more lines are too long

View File

@ -3,13 +3,6 @@
*/ */
$(document).ready(function() { $(document).ready(function() {
//this is a hotfix to make collapsible bs panels work again. this needs fixing in bootstrap.
$('a').on('click', function(e) {
if($(this).data('toggle') == 'collapse') {
e.preventDefault();
}
});
// CSS3 calc() fallback (for unsupported browsers) // CSS3 calc() fallback (for unsupported browsers)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); $('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) { if( $('#css3-calc').width() == 10) {