0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
This commit is contained in:
Mark Otto 2018-02-19 14:50:56 -08:00
parent 33f3ba33c2
commit 6a52ebfe1a
15 changed files with 218 additions and 31 deletions

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

@ -3527,13 +3527,13 @@ tbody.collapse.show {
} }
.input-group > .custom-file:not(:last-child) .custom-file-label, .input-group > .custom-file:not(:last-child) .custom-file-label,
.input-group > .custom-file:not(:last-child) .custom-file-label::before { .input-group > .custom-file:not(:last-child) .custom-file-label::after {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.input-group > .custom-file:not(:first-child) .custom-file-label, .input-group > .custom-file:not(:first-child) .custom-file-label,
.input-group > .custom-file:not(:first-child) .custom-file-label::before { .input-group > .custom-file:not(:first-child) .custom-file-label::after {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
@ -3853,6 +3853,121 @@ tbody.collapse.show {
border-radius: 0 0.25rem 0.25rem 0; border-radius: 0 0.25rem 0.25rem 0;
} }
.custom-range {
width: 100%;
padding-left: 0;
background-color: transparent;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
}
.custom-range:focus {
outline: none;
}
.custom-range::-moz-focus-outer {
border: 0;
}
.custom-range::-webkit-slider-thumb {
width: 1rem;
height: 1rem;
margin-top: -0.25rem;
background-color: #007bff;
border: 0;
border-radius: 1rem;
-webkit-appearance: none;
appearance: none;
}
.custom-range::-webkit-slider-thumb:focus {
outline: none;
box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
.custom-range::-webkit-slider-thumb:active {
background-color: #b3d7ff;
}
.custom-range::-webkit-slider-runnable-track {
width: 100%;
height: 0.5rem;
color: transparent;
cursor: pointer;
background-color: #dee2e6;
border-color: transparent;
border-radius: 1rem;
}
.custom-range::-moz-range-thumb {
width: 1rem;
height: 1rem;
background-color: #007bff;
border: 0;
border-radius: 1rem;
-moz-appearance: none;
appearance: none;
}
.custom-range::-moz-range-thumb:focus {
outline: none;
box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
.custom-range::-moz-range-thumb:active {
background-color: #b3d7ff;
}
.custom-range::-moz-range-track {
width: 100%;
height: 0.5rem;
color: transparent;
cursor: pointer;
background-color: #dee2e6;
border-color: transparent;
border-radius: 1rem;
}
.custom-range::-ms-thumb {
width: 1rem;
height: 1rem;
background-color: #007bff;
border: 0;
border-radius: 1rem;
appearance: none;
}
.custom-range::-ms-thumb:focus {
outline: none;
box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
}
.custom-range::-ms-thumb:active {
background-color: #b3d7ff;
}
.custom-range::-ms-track {
width: 100%;
height: 0.5rem;
color: transparent;
cursor: pointer;
background-color: transparent;
border-color: transparent;
border-width: 0.5rem;
}
.custom-range::-ms-fill-lower {
background-color: #dee2e6;
border-radius: 1rem;
}
.custom-range::-ms-fill-upper {
margin-right: 15px;
background-color: #dee2e6;
border-radius: 1rem;
}
.nav { .nav {
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
@ -5146,6 +5261,7 @@ tbody.collapse.show {
justify-content: center; justify-content: center;
color: #fff; color: #fff;
text-align: center; text-align: center;
white-space: nowrap;
background-color: #007bff; background-color: #007bff;
transition: width 0.6s ease; transition: width 0.6s ease;
} }
@ -7428,8 +7544,6 @@ button.bg-dark:focus {
overflow: hidden; overflow: hidden;
clip: rect(0, 0, 0, 0); clip: rect(0, 0, 0, 0);
white-space: nowrap; white-space: nowrap;
-webkit-clip-path: inset(50%);
clip-path: inset(50%);
border: 0; border: 0;
} }
@ -7440,8 +7554,6 @@ button.bg-dark:focus {
overflow: visible; overflow: visible;
clip: auto; clip: auto;
white-space: normal; white-space: normal;
-webkit-clip-path: none;
clip-path: none;
} }
.w-25 { .w-25 {

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

@ -533,13 +533,13 @@ var Carousel = function ($$$1) {
var EVENT_KEY = "." + DATA_KEY; var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api'; var DATA_API_KEY = '.data-api';
var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
var TRANSITION_DURATION = 600;
var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key
var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key
var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
var MILLISECONDS_MULTIPLIER = 1000;
var Default = { var Default = {
interval: 5000, interval: 5000,
keyboard: true, keyboard: true,
@ -609,6 +609,7 @@ var Carousel = function ($$$1) {
this._config = this._getConfig(config); this._config = this._getConfig(config);
this._element = $$$1(element)[0]; this._element = $$$1(element)[0];
this._indicatorsElement = $$$1(this._element).find(Selector.INDICATORS)[0]; this._indicatorsElement = $$$1(this._element).find(Selector.INDICATORS)[0];
this._transitionDuration = this._getTransitionDuration();
this._addEventListeners(); this._addEventListeners();
} // Getters } // Getters
@ -715,6 +716,20 @@ var Carousel = function ($$$1) {
return config; return config;
}; };
_proto._getTransitionDuration = function _getTransitionDuration() {
// Get transition-duration of first element in the carousel
var transitionDuration = $$$1(this._element).find(Selector.ITEM).css('transition-duration'); // Return 0 carousel item is not found
if (!transitionDuration) {
return 0;
} // If multiple durations are defined, take the first
transitionDuration = transitionDuration.split(',')[0]; // Multiply by 1000 if transition-duration is defined in seconds
return transitionDuration.indexOf('ms') > -1 ? parseFloat(transitionDuration) : parseFloat(transitionDuration) * MILLISECONDS_MULTIPLIER;
};
_proto._addEventListeners = function _addEventListeners() { _proto._addEventListeners = function _addEventListeners() {
var _this2 = this; var _this2 = this;
@ -893,7 +908,7 @@ var Carousel = function ($$$1) {
setTimeout(function () { setTimeout(function () {
return $$$1(_this3._element).trigger(slidEvent); return $$$1(_this3._element).trigger(slidEvent);
}, 0); }, 0);
}).emulateTransitionEnd(TRANSITION_DURATION); }).emulateTransitionEnd(this._transitionDuration);
} else { } else {
$$$1(activeElement).removeClass(ClassName.ACTIVE); $$$1(activeElement).removeClass(ClassName.ACTIVE);
$$$1(nextElement).addClass(ClassName.ACTIVE); $$$1(nextElement).addClass(ClassName.ACTIVE);
@ -3890,13 +3905,15 @@ var Dropdown = function ($$$1) {
offset: 0, offset: 0,
flip: true, flip: true,
boundary: 'scrollParent', boundary: 'scrollParent',
reference: 'toggle' reference: 'toggle',
display: 'dynamic'
}; };
var DefaultType = { var DefaultType = {
offset: '(number|string|function)', offset: '(number|string|function)',
flip: 'boolean', flip: 'boolean',
boundary: '(string|element)', boundary: '(string|element)',
reference: '(string|element)' reference: '(string|element)',
display: 'string'
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
* Class Definition * Class Definition
@ -4093,8 +4110,16 @@ var Dropdown = function ($$$1) {
preventOverflow: { preventOverflow: {
boundariesElement: this._config.boundary boundariesElement: this._config.boundary
} }
} } // Disable Popper.js if we have a static display
}; };
if (this._config.display === 'static') {
popperConfig.modifiers.applyStyle = {
enabled: false
};
}
return popperConfig; return popperConfig;
}; // Static }; // Static

File diff suppressed because one or more lines are too long

View File

@ -534,13 +534,13 @@ var Carousel = function ($$$1) {
var EVENT_KEY = "." + DATA_KEY; var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api'; var DATA_API_KEY = '.data-api';
var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; var JQUERY_NO_CONFLICT = $$$1.fn[NAME];
var TRANSITION_DURATION = 600;
var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key
var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key
var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
var MILLISECONDS_MULTIPLIER = 1000;
var Default = { var Default = {
interval: 5000, interval: 5000,
keyboard: true, keyboard: true,
@ -610,6 +610,7 @@ var Carousel = function ($$$1) {
this._config = this._getConfig(config); this._config = this._getConfig(config);
this._element = $$$1(element)[0]; this._element = $$$1(element)[0];
this._indicatorsElement = $$$1(this._element).find(Selector.INDICATORS)[0]; this._indicatorsElement = $$$1(this._element).find(Selector.INDICATORS)[0];
this._transitionDuration = this._getTransitionDuration();
this._addEventListeners(); this._addEventListeners();
} // Getters } // Getters
@ -716,6 +717,20 @@ var Carousel = function ($$$1) {
return config; return config;
}; };
_proto._getTransitionDuration = function _getTransitionDuration() {
// Get transition-duration of first element in the carousel
var transitionDuration = $$$1(this._element).find(Selector.ITEM).css('transition-duration'); // Return 0 carousel item is not found
if (!transitionDuration) {
return 0;
} // If multiple durations are defined, take the first
transitionDuration = transitionDuration.split(',')[0]; // Multiply by 1000 if transition-duration is defined in seconds
return transitionDuration.indexOf('ms') > -1 ? parseFloat(transitionDuration) : parseFloat(transitionDuration) * MILLISECONDS_MULTIPLIER;
};
_proto._addEventListeners = function _addEventListeners() { _proto._addEventListeners = function _addEventListeners() {
var _this2 = this; var _this2 = this;
@ -894,7 +909,7 @@ var Carousel = function ($$$1) {
setTimeout(function () { setTimeout(function () {
return $$$1(_this3._element).trigger(slidEvent); return $$$1(_this3._element).trigger(slidEvent);
}, 0); }, 0);
}).emulateTransitionEnd(TRANSITION_DURATION); }).emulateTransitionEnd(this._transitionDuration);
} else { } else {
$$$1(activeElement).removeClass(ClassName.ACTIVE); $$$1(activeElement).removeClass(ClassName.ACTIVE);
$$$1(nextElement).addClass(ClassName.ACTIVE); $$$1(nextElement).addClass(ClassName.ACTIVE);
@ -1456,13 +1471,15 @@ var Dropdown = function ($$$1) {
offset: 0, offset: 0,
flip: true, flip: true,
boundary: 'scrollParent', boundary: 'scrollParent',
reference: 'toggle' reference: 'toggle',
display: 'dynamic'
}; };
var DefaultType = { var DefaultType = {
offset: '(number|string|function)', offset: '(number|string|function)',
flip: 'boolean', flip: 'boolean',
boundary: '(string|element)', boundary: '(string|element)',
reference: '(string|element)' reference: '(string|element)',
display: 'string'
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
* Class Definition * Class Definition
@ -1659,8 +1676,16 @@ var Dropdown = function ($$$1) {
preventOverflow: { preventOverflow: {
boundariesElement: this._config.boundary boundariesElement: this._config.boundary
} }
} } // Disable Popper.js if we have a static display
}; };
if (this._config.display === 'static') {
popperConfig.modifiers.applyStyle = {
enabled: false
};
}
return popperConfig; return popperConfig;
}; // Static }; // Static

File diff suppressed because one or more lines are too long

19
js/dist/carousel.js vendored
View File

@ -22,13 +22,13 @@ var Carousel = function ($) {
var EVENT_KEY = "." + DATA_KEY; var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api'; var DATA_API_KEY = '.data-api';
var JQUERY_NO_CONFLICT = $.fn[NAME]; var JQUERY_NO_CONFLICT = $.fn[NAME];
var TRANSITION_DURATION = 600;
var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key
var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key
var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
var MILLISECONDS_MULTIPLIER = 1000;
var Default = { var Default = {
interval: 5000, interval: 5000,
keyboard: true, keyboard: true,
@ -98,6 +98,7 @@ var Carousel = function ($) {
this._config = this._getConfig(config); this._config = this._getConfig(config);
this._element = $(element)[0]; this._element = $(element)[0];
this._indicatorsElement = $(this._element).find(Selector.INDICATORS)[0]; this._indicatorsElement = $(this._element).find(Selector.INDICATORS)[0];
this._transitionDuration = this._getTransitionDuration();
this._addEventListeners(); this._addEventListeners();
} // Getters } // Getters
@ -204,6 +205,20 @@ var Carousel = function ($) {
return config; return config;
}; };
_proto._getTransitionDuration = function _getTransitionDuration() {
// Get transition-duration of first element in the carousel
var transitionDuration = $(this._element).find(Selector.ITEM).css('transition-duration'); // Return 0 carousel item is not found
if (!transitionDuration) {
return 0;
} // If multiple durations are defined, take the first
transitionDuration = transitionDuration.split(',')[0]; // Multiply by 1000 if transition-duration is defined in seconds
return transitionDuration.indexOf('ms') > -1 ? parseFloat(transitionDuration) : parseFloat(transitionDuration) * MILLISECONDS_MULTIPLIER;
};
_proto._addEventListeners = function _addEventListeners() { _proto._addEventListeners = function _addEventListeners() {
var _this2 = this; var _this2 = this;
@ -382,7 +397,7 @@ var Carousel = function ($) {
setTimeout(function () { setTimeout(function () {
return $(_this3._element).trigger(slidEvent); return $(_this3._element).trigger(slidEvent);
}, 0); }, 0);
}).emulateTransitionEnd(TRANSITION_DURATION); }).emulateTransitionEnd(this._transitionDuration);
} else { } else {
$(activeElement).removeClass(ClassName.ACTIVE); $(activeElement).removeClass(ClassName.ACTIVE);
$(nextElement).addClass(ClassName.ACTIVE); $(nextElement).addClass(ClassName.ACTIVE);

File diff suppressed because one or more lines are too long

16
js/dist/dropdown.js vendored
View File

@ -76,13 +76,15 @@ var Dropdown = function ($) {
offset: 0, offset: 0,
flip: true, flip: true,
boundary: 'scrollParent', boundary: 'scrollParent',
reference: 'toggle' reference: 'toggle',
display: 'dynamic'
}; };
var DefaultType = { var DefaultType = {
offset: '(number|string|function)', offset: '(number|string|function)',
flip: 'boolean', flip: 'boolean',
boundary: '(string|element)', boundary: '(string|element)',
reference: '(string|element)' reference: '(string|element)',
display: 'string'
/** /**
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
* Class Definition * Class Definition
@ -279,8 +281,16 @@ var Dropdown = function ($) {
preventOverflow: { preventOverflow: {
boundariesElement: this._config.boundary boundariesElement: this._config.boundary
} }
} } // Disable Popper.js if we have a static display
}; };
if (this._config.display === 'static') {
popperConfig.modifiers.applyStyle = {
enabled: false
};
}
return popperConfig; return popperConfig;
}; // Static }; // Static

File diff suppressed because one or more lines are too long