0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
This commit is contained in:
Mark Otto 2017-03-28 09:31:32 -07:00
parent 296c99020c
commit cf7d3e11e0
16 changed files with 75 additions and 37 deletions

File diff suppressed because one or more lines are too long

View File

@ -2151,7 +2151,7 @@ pre code {
.form-control {
display: block;
width: 100%;
padding: 0.5rem 0.75rem;
padding: 0.5rem 1rem;
font-size: 1rem;
line-height: 1.25;
color: #464a4c;
@ -2230,8 +2230,8 @@ select.form-control:focus::-ms-value {
}
.col-form-label-lg {
padding-top: calc(0.75rem - 1px * 2);
padding-bottom: calc(0.75rem - 1px * 2);
padding-top: calc(0.5rem - 1px * 2);
padding-bottom: calc(0.5rem - 1px * 2);
font-size: 1.25rem;
}
@ -2271,27 +2271,29 @@ select.form-control:focus::-ms-value {
.input-group-sm > .input-group-btn > .btn {
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
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 > .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,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
padding: 0.75rem 1.5rem;
padding: 0.5rem 1rem;
font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem;
}
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 > .input-group-btn > select.btn:not([size]):not([multiple]) {
height: 3.166667rem;
height: calc(2.875rem + 2px);
}
.form-group {
@ -2348,7 +2350,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.form-control-success,
.form-control-warning,
.form-control-danger {
padding-right: 2.25rem;
padding-right: 3rem;
background-repeat: no-repeat;
background-position: center right 0.5625rem;
-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 {
display: inline-block;
font-weight: normal;
line-height: 1.25;
text-align: center;
white-space: nowrap;
vertical-align: middle;
@ -2564,6 +2565,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
border: 1px solid transparent;
padding: 0.5rem 1rem;
font-size: 1rem;
line-height: 1.25;
border-radius: 0.25rem;
-webkit-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 {
padding: 0.75rem 1.5rem;
padding: 0.5rem 1rem;
font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem;
}
.btn-sm, .btn-group-sm > .btn {
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
@ -3291,8 +3295,8 @@ tbody.collapse.show {
}
.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
padding-right: 1.125rem;
padding-left: 1.125rem;
padding-right: 0.75rem;
padding-left: 0.75rem;
}
.btn-group-vertical {
@ -3416,7 +3420,7 @@ tbody.collapse.show {
}
.input-group-addon {
padding: 0.5rem 0.75rem;
padding: 0.5rem 1rem;
margin-bottom: 0;
font-size: 1rem;
font-weight: normal;
@ -3439,7 +3443,7 @@ tbody.collapse.show {
.input-group-addon.form-control-lg,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .input-group-addon.btn {
padding: 0.75rem 1.5rem;
padding: 0.5rem 1rem;
font-size: 1.25rem;
border-radius: 0.3rem;
}

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

@ -2794,6 +2794,7 @@ var Tooltip = function ($) {
var JQUERY_NO_CONFLICT = $.fn[NAME];
var TRANSITION_DURATION = 150;
var CLASS_PREFIX = 'bs-tether';
var TETHER_PREFIX_REGEX = new RegExp('(^|\\s)' + CLASS_PREFIX + '\\S+', 'g');
var Default = {
animation: true,
@ -3058,6 +3059,7 @@ var Tooltip = function ($) {
tip.parentNode.removeChild(tip);
}
_this23._cleanTipClass();
_this23.element.removeAttribute('aria-describedby');
$(_this23.element).trigger(_this23.constructor.Event.HIDDEN);
_this23._isTransitioning = false;
@ -3148,6 +3150,14 @@ var Tooltip = function ($) {
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() {
var _this24 = this;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2151,7 +2151,7 @@ pre code {
.form-control {
display: block;
width: 100%;
padding: 0.5rem 0.75rem;
padding: 0.5rem 1rem;
font-size: 1rem;
line-height: 1.25;
color: #464a4c;
@ -2230,8 +2230,8 @@ select.form-control:focus::-ms-value {
}
.col-form-label-lg {
padding-top: calc(0.75rem - 1px * 2);
padding-bottom: calc(0.75rem - 1px * 2);
padding-top: calc(0.5rem - 1px * 2);
padding-bottom: calc(0.5rem - 1px * 2);
font-size: 1.25rem;
}
@ -2271,27 +2271,29 @@ select.form-control:focus::-ms-value {
.input-group-sm > .input-group-btn > .btn {
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
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 > .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,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
padding: 0.75rem 1.5rem;
padding: 0.5rem 1rem;
font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem;
}
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 > .input-group-btn > select.btn:not([size]):not([multiple]) {
height: 3.166667rem;
height: calc(2.875rem + 2px);
}
.form-group {
@ -2348,7 +2350,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.form-control-success,
.form-control-warning,
.form-control-danger {
padding-right: 2.25rem;
padding-right: 3rem;
background-repeat: no-repeat;
background-position: center right 0.5625rem;
-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 {
display: inline-block;
font-weight: normal;
line-height: 1.25;
text-align: center;
white-space: nowrap;
vertical-align: middle;
@ -2564,6 +2565,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
border: 1px solid transparent;
padding: 0.5rem 1rem;
font-size: 1rem;
line-height: 1.25;
border-radius: 0.25rem;
-webkit-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 {
padding: 0.75rem 1.5rem;
padding: 0.5rem 1rem;
font-size: 1.25rem;
line-height: 1.5;
border-radius: 0.3rem;
}
.btn-sm, .btn-group-sm > .btn {
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
@ -3291,8 +3295,8 @@ tbody.collapse.show {
}
.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
padding-right: 1.125rem;
padding-left: 1.125rem;
padding-right: 0.75rem;
padding-left: 0.75rem;
}
.btn-group-vertical {
@ -3416,7 +3420,7 @@ tbody.collapse.show {
}
.input-group-addon {
padding: 0.5rem 0.75rem;
padding: 0.5rem 1rem;
margin-bottom: 0;
font-size: 1rem;
font-weight: normal;
@ -3439,7 +3443,7 @@ tbody.collapse.show {
.input-group-addon.form-control-lg,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .input-group-addon.btn {
padding: 0.75rem 1.5rem;
padding: 0.5rem 1rem;
font-size: 1.25rem;
border-radius: 0.3rem;
}

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

@ -2794,6 +2794,7 @@ var Tooltip = function ($) {
var JQUERY_NO_CONFLICT = $.fn[NAME];
var TRANSITION_DURATION = 150;
var CLASS_PREFIX = 'bs-tether';
var TETHER_PREFIX_REGEX = new RegExp('(^|\\s)' + CLASS_PREFIX + '\\S+', 'g');
var Default = {
animation: true,
@ -3058,6 +3059,7 @@ var Tooltip = function ($) {
tip.parentNode.removeChild(tip);
}
_this23._cleanTipClass();
_this23.element.removeAttribute('aria-describedby');
$(_this23.element).trigger(_this23.constructor.Event.HIDDEN);
_this23._isTransitioning = false;
@ -3148,6 +3150,14 @@ var Tooltip = function ($) {
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() {
var _this24 = this;

File diff suppressed because one or more lines are too long

10
js/dist/tooltip.js vendored
View File

@ -34,6 +34,7 @@ var Tooltip = function ($) {
var JQUERY_NO_CONFLICT = $.fn[NAME];
var TRANSITION_DURATION = 150;
var CLASS_PREFIX = 'bs-tether';
var TETHER_PREFIX_REGEX = new RegExp('(^|\\s)' + CLASS_PREFIX + '\\S+', 'g');
var Default = {
animation: true,
@ -298,6 +299,7 @@ var Tooltip = function ($) {
tip.parentNode.removeChild(tip);
}
_this2._cleanTipClass();
_this2.element.removeAttribute('aria-describedby');
$(_this2.element).trigger(_this2.constructor.Event.HIDDEN);
_this2._isTransitioning = false;
@ -388,6 +390,14 @@ var Tooltip = function ($) {
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() {
var _this3 = this;

File diff suppressed because one or more lines are too long