1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
This commit is contained in:
Mark Otto 2017-03-26 11:26:31 -07:00
parent e20d744bdf
commit 4ab06ca453
17 changed files with 282 additions and 229 deletions

View file

@ -3713,7 +3713,7 @@ tbody.collapse.show {
.nav-link { .nav-link {
display: block; display: block;
padding: 0.5em 1em; padding: 0.5rem 1rem;
} }
.nav-link:focus, .nav-link:hover { .nav-link:focus, .nav-link:hover {
@ -3805,16 +3805,35 @@ tbody.collapse.show {
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
-webkit-box-orient: vertical; -webkit-flex-wrap: wrap;
-webkit-box-direction: normal; -ms-flex-wrap: wrap;
-webkit-flex-direction: column; flex-wrap: wrap;
-ms-flex-direction: column; -webkit-box-pack: justify;
flex-direction: column; -webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
} }
.navbar > .container,
.navbar > .container-fluid {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
}
@media (max-width: 575px) { @media (max-width: 575px) {
.navbar > .container { .navbar > .container,
.navbar > .container-fluid {
width: 100%;
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
} }
@ -3825,8 +3844,8 @@ tbody.collapse.show {
-webkit-align-self: flex-start; -webkit-align-self: flex-start;
-ms-flex-item-align: start; -ms-flex-item-align: start;
align-self: flex-start; align-self: flex-start;
padding-top: .25rem; padding-top: 0.3125rem;
padding-bottom: .25rem; padding-bottom: 0.3125rem;
margin-right: 1rem; margin-right: 1rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: inherit; line-height: inherit;
@ -3859,8 +3878,14 @@ tbody.collapse.show {
.navbar-text { .navbar-text {
display: inline-block; display: inline-block;
padding-top: .425rem; padding-top: 0.5rem;
padding-bottom: .425rem; padding-bottom: 0.5rem;
}
.navbar-collapse {
-webkit-flex-basis: 100%;
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
} }
.navbar-toggler { .navbar-toggler {
@ -3890,29 +3915,20 @@ tbody.collapse.show {
background-size: 100% 100%; background-size: 100% 100%;
} }
.navbar-toggler-left {
position: absolute;
left: 1rem;
}
.navbar-toggler-right {
position: absolute;
right: 1rem;
}
@media (max-width: 575px) { @media (max-width: 575px) {
.navbar-toggleable .navbar-nav .dropdown-menu { .navbar-expand-sm .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable > .container { .navbar-expand-sm > .container,
.navbar-expand-sm > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 576px) { @media (min-width: 576px) {
.navbar-toggleable { .navbar-expand-sm {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -3925,23 +3941,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable .navbar-nav { .navbar-expand-sm .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable .navbar-nav .nav-link { .navbar-expand-sm .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable > .container { .navbar-expand-sm > .container,
display: -webkit-box; .navbar-expand-sm > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -3950,31 +3967,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable .navbar-collapse { .navbar-expand-sm .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable .navbar-toggler { .navbar-expand-sm .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar-toggleable-sm .navbar-nav .dropdown-menu { .navbar-expand-md .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-sm > .container { .navbar-expand-md > .container,
.navbar-expand-md > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-toggleable-sm { .navbar-expand-md {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -3987,23 +4004,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-sm .navbar-nav { .navbar-expand-md .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-sm .navbar-nav .nav-link { .navbar-expand-md .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-sm > .container { .navbar-expand-md > .container,
display: -webkit-box; .navbar-expand-md > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4012,31 +4030,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-sm .navbar-collapse { .navbar-expand-md .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-sm .navbar-toggler { .navbar-expand-md .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 991px) { @media (max-width: 991px) {
.navbar-toggleable-md .navbar-nav .dropdown-menu { .navbar-expand-lg .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-md > .container { .navbar-expand-lg > .container,
.navbar-expand-lg > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.navbar-toggleable-md { .navbar-expand-lg {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4049,23 +4067,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-md .navbar-nav { .navbar-expand-lg .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-md .navbar-nav .nav-link { .navbar-expand-lg .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-md > .container { .navbar-expand-lg > .container,
display: -webkit-box; .navbar-expand-lg > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4074,31 +4093,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-md .navbar-collapse { .navbar-expand-lg .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-md .navbar-toggler { .navbar-expand-lg .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 1199px) { @media (max-width: 1199px) {
.navbar-toggleable-lg .navbar-nav .dropdown-menu { .navbar-expand-xl .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-lg > .container { .navbar-expand-xl > .container,
.navbar-expand-xl > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.navbar-toggleable-lg { .navbar-expand-xl {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4111,23 +4130,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-lg .navbar-nav { .navbar-expand-xl .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-lg .navbar-nav .nav-link { .navbar-expand-xl .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-lg > .container { .navbar-expand-xl > .container,
display: -webkit-box; .navbar-expand-xl > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4136,19 +4156,18 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-lg .navbar-collapse { .navbar-expand-xl .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-lg .navbar-toggler { .navbar-expand-xl .navbar-toggler {
display: none; display: none;
} }
} }
.navbar-toggleable-xl { .navbar-expand {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4161,19 +4180,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-xl .navbar-nav .dropdown-menu { .navbar-expand .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-xl > .container { .navbar-expand > .container,
.navbar-expand > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
.navbar-toggleable-xl .navbar-nav { .navbar-expand .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4181,16 +4205,13 @@ tbody.collapse.show {
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-xl .navbar-nav .nav-link { .navbar-expand .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-xl > .container { .navbar-expand > .container,
display: -webkit-box; .navbar-expand > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4200,26 +4221,22 @@ tbody.collapse.show {
align-items: center; align-items: center;
} }
.navbar-toggleable-xl .navbar-collapse { .navbar-expand .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-xl .navbar-toggler { .navbar-expand .navbar-toggler {
display: none; display: none;
} }
.navbar-light .navbar-brand, .navbar-light .navbar-brand {
.navbar-light .navbar-toggler {
color: rgba(0, 0, 0, 0.9); color: rgba(0, 0, 0, 0.9);
} }
.navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover {
.navbar-light .navbar-toggler:focus,
.navbar-light .navbar-toggler:hover {
color: rgba(0, 0, 0, 0.9); color: rgba(0, 0, 0, 0.9);
} }
@ -4243,6 +4260,7 @@ tbody.collapse.show {
} }
.navbar-light .navbar-toggler { .navbar-light .navbar-toggler {
color: rgba(0, 0, 0, 0.5);
border-color: rgba(0, 0, 0, 0.1); border-color: rgba(0, 0, 0, 0.1);
} }
@ -4254,14 +4272,11 @@ tbody.collapse.show {
color: rgba(0, 0, 0, 0.5); color: rgba(0, 0, 0, 0.5);
} }
.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand {
.navbar-inverse .navbar-toggler {
color: white; color: white;
} }
.navbar-inverse .navbar-brand:focus, .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus, .navbar-inverse .navbar-brand:hover {
.navbar-inverse .navbar-toggler:focus,
.navbar-inverse .navbar-toggler:hover {
color: white; color: white;
} }
@ -4285,6 +4300,7 @@ tbody.collapse.show {
} }
.navbar-inverse .navbar-toggler { .navbar-inverse .navbar-toggler {
color: rgba(255, 255, 255, 0.5);
border-color: rgba(255, 255, 255, 0.1); border-color: rgba(255, 255, 255, 0.1);
} }

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

@ -791,9 +791,13 @@ var Carousel = function ($) {
}; };
Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) { Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
var targetIndex = this._getItemIndex(relatedTarget);
var fromIndex = this._getItemIndex($(this._element).find(Selector.ACTIVE_ITEM)[0]);
var slideEvent = $.Event(Event.SLIDE, { var slideEvent = $.Event(Event.SLIDE, {
relatedTarget: relatedTarget, relatedTarget: relatedTarget,
direction: eventDirectionName direction: eventDirectionName,
from: fromIndex,
to: targetIndex
}); });
$(this._element).trigger(slideEvent); $(this._element).trigger(slideEvent);
@ -817,8 +821,9 @@ var Carousel = function ($) {
var _this5 = this; var _this5 = this;
var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0]; var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0];
var activeElementIndex = this._getItemIndex(activeElement);
var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement); var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
var nextElementIndex = this._getItemIndex(nextElement);
var isCycling = Boolean(this._interval); var isCycling = Boolean(this._interval);
var directionalClassName = void 0; var directionalClassName = void 0;
@ -860,7 +865,9 @@ var Carousel = function ($) {
var slidEvent = $.Event(Event.SLID, { var slidEvent = $.Event(Event.SLID, {
relatedTarget: nextElement, relatedTarget: nextElement,
direction: eventDirectionName direction: eventDirectionName,
from: activeElementIndex,
to: nextElementIndex
}); });
if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) { if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) {
@ -1854,6 +1861,10 @@ var Modal = function ($) {
this._scrollbarWidth = null; this._scrollbarWidth = null;
}; };
Modal.prototype.handleUpdate = function handleUpdate() {
this._adjustDialog();
};
// private // private
Modal.prototype._getConfig = function _getConfig(config) { Modal.prototype._getConfig = function _getConfig(config) {
@ -1935,7 +1946,7 @@ var Modal = function ($) {
if (this._isShown) { if (this._isShown) {
$(window).on(Event.RESIZE, function (event) { $(window).on(Event.RESIZE, function (event) {
return _this14._handleUpdate(event); return _this14.handleUpdate(event);
}); });
} else { } else {
$(window).off(Event.RESIZE); $(window).off(Event.RESIZE);
@ -2036,10 +2047,6 @@ var Modal = function ($) {
// todo (fat): these should probably be refactored out of modal.js // todo (fat): these should probably be refactored out of modal.js
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
Modal.prototype._handleUpdate = function _handleUpdate() {
this._adjustDialog();
};
Modal.prototype._adjustDialog = function _adjustDialog() { Modal.prototype._adjustDialog = function _adjustDialog() {
var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight; var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -3713,7 +3713,7 @@ tbody.collapse.show {
.nav-link { .nav-link {
display: block; display: block;
padding: 0.5em 1em; padding: 0.5rem 1rem;
} }
.nav-link:focus, .nav-link:hover { .nav-link:focus, .nav-link:hover {
@ -3805,16 +3805,35 @@ tbody.collapse.show {
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
-webkit-box-orient: vertical; -webkit-flex-wrap: wrap;
-webkit-box-direction: normal; -ms-flex-wrap: wrap;
-webkit-flex-direction: column; flex-wrap: wrap;
-ms-flex-direction: column; -webkit-box-pack: justify;
flex-direction: column; -webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
} }
.navbar > .container,
.navbar > .container-fluid {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
}
@media (max-width: 575px) { @media (max-width: 575px) {
.navbar > .container { .navbar > .container,
.navbar > .container-fluid {
width: 100%;
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
} }
@ -3825,8 +3844,8 @@ tbody.collapse.show {
-webkit-align-self: flex-start; -webkit-align-self: flex-start;
-ms-flex-item-align: start; -ms-flex-item-align: start;
align-self: flex-start; align-self: flex-start;
padding-top: .25rem; padding-top: 0.3125rem;
padding-bottom: .25rem; padding-bottom: 0.3125rem;
margin-right: 1rem; margin-right: 1rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: inherit; line-height: inherit;
@ -3859,8 +3878,14 @@ tbody.collapse.show {
.navbar-text { .navbar-text {
display: inline-block; display: inline-block;
padding-top: .425rem; padding-top: 0.5rem;
padding-bottom: .425rem; padding-bottom: 0.5rem;
}
.navbar-collapse {
-webkit-flex-basis: 100%;
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
} }
.navbar-toggler { .navbar-toggler {
@ -3890,29 +3915,20 @@ tbody.collapse.show {
background-size: 100% 100%; background-size: 100% 100%;
} }
.navbar-toggler-left {
position: absolute;
left: 1rem;
}
.navbar-toggler-right {
position: absolute;
right: 1rem;
}
@media (max-width: 575px) { @media (max-width: 575px) {
.navbar-toggleable .navbar-nav .dropdown-menu { .navbar-expand-sm .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable > .container { .navbar-expand-sm > .container,
.navbar-expand-sm > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 576px) { @media (min-width: 576px) {
.navbar-toggleable { .navbar-expand-sm {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -3925,23 +3941,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable .navbar-nav { .navbar-expand-sm .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable .navbar-nav .nav-link { .navbar-expand-sm .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable > .container { .navbar-expand-sm > .container,
display: -webkit-box; .navbar-expand-sm > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -3950,31 +3967,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable .navbar-collapse { .navbar-expand-sm .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable .navbar-toggler { .navbar-expand-sm .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar-toggleable-sm .navbar-nav .dropdown-menu { .navbar-expand-md .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-sm > .container { .navbar-expand-md > .container,
.navbar-expand-md > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-toggleable-sm { .navbar-expand-md {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -3987,23 +4004,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-sm .navbar-nav { .navbar-expand-md .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-sm .navbar-nav .nav-link { .navbar-expand-md .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-sm > .container { .navbar-expand-md > .container,
display: -webkit-box; .navbar-expand-md > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4012,31 +4030,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-sm .navbar-collapse { .navbar-expand-md .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-sm .navbar-toggler { .navbar-expand-md .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 991px) { @media (max-width: 991px) {
.navbar-toggleable-md .navbar-nav .dropdown-menu { .navbar-expand-lg .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-md > .container { .navbar-expand-lg > .container,
.navbar-expand-lg > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.navbar-toggleable-md { .navbar-expand-lg {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4049,23 +4067,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-md .navbar-nav { .navbar-expand-lg .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-md .navbar-nav .nav-link { .navbar-expand-lg .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-md > .container { .navbar-expand-lg > .container,
display: -webkit-box; .navbar-expand-lg > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4074,31 +4093,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-md .navbar-collapse { .navbar-expand-lg .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-md .navbar-toggler { .navbar-expand-lg .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 1199px) { @media (max-width: 1199px) {
.navbar-toggleable-lg .navbar-nav .dropdown-menu { .navbar-expand-xl .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-lg > .container { .navbar-expand-xl > .container,
.navbar-expand-xl > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.navbar-toggleable-lg { .navbar-expand-xl {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4111,23 +4130,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-lg .navbar-nav { .navbar-expand-xl .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-lg .navbar-nav .nav-link { .navbar-expand-xl .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-lg > .container { .navbar-expand-xl > .container,
display: -webkit-box; .navbar-expand-xl > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4136,19 +4156,18 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-lg .navbar-collapse { .navbar-expand-xl .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-lg .navbar-toggler { .navbar-expand-xl .navbar-toggler {
display: none; display: none;
} }
} }
.navbar-toggleable-xl { .navbar-expand {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4161,19 +4180,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-xl .navbar-nav .dropdown-menu { .navbar-expand .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-xl > .container { .navbar-expand > .container,
.navbar-expand > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
.navbar-toggleable-xl .navbar-nav { .navbar-expand .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4181,16 +4205,13 @@ tbody.collapse.show {
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-xl .navbar-nav .nav-link { .navbar-expand .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-xl > .container { .navbar-expand > .container,
display: -webkit-box; .navbar-expand > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4200,26 +4221,22 @@ tbody.collapse.show {
align-items: center; align-items: center;
} }
.navbar-toggleable-xl .navbar-collapse { .navbar-expand .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-xl .navbar-toggler { .navbar-expand .navbar-toggler {
display: none; display: none;
} }
.navbar-light .navbar-brand, .navbar-light .navbar-brand {
.navbar-light .navbar-toggler {
color: rgba(0, 0, 0, 0.9); color: rgba(0, 0, 0, 0.9);
} }
.navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover {
.navbar-light .navbar-toggler:focus,
.navbar-light .navbar-toggler:hover {
color: rgba(0, 0, 0, 0.9); color: rgba(0, 0, 0, 0.9);
} }
@ -4243,6 +4260,7 @@ tbody.collapse.show {
} }
.navbar-light .navbar-toggler { .navbar-light .navbar-toggler {
color: rgba(0, 0, 0, 0.5);
border-color: rgba(0, 0, 0, 0.1); border-color: rgba(0, 0, 0, 0.1);
} }
@ -4254,14 +4272,11 @@ tbody.collapse.show {
color: rgba(0, 0, 0, 0.5); color: rgba(0, 0, 0, 0.5);
} }
.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand {
.navbar-inverse .navbar-toggler {
color: white; color: white;
} }
.navbar-inverse .navbar-brand:focus, .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus, .navbar-inverse .navbar-brand:hover {
.navbar-inverse .navbar-toggler:focus,
.navbar-inverse .navbar-toggler:hover {
color: white; color: white;
} }
@ -4285,6 +4300,7 @@ tbody.collapse.show {
} }
.navbar-inverse .navbar-toggler { .navbar-inverse .navbar-toggler {
color: rgba(255, 255, 255, 0.5);
border-color: rgba(255, 255, 255, 0.1); border-color: rgba(255, 255, 255, 0.1);
} }

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

@ -791,9 +791,13 @@ var Carousel = function ($) {
}; };
Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) { Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
var targetIndex = this._getItemIndex(relatedTarget);
var fromIndex = this._getItemIndex($(this._element).find(Selector.ACTIVE_ITEM)[0]);
var slideEvent = $.Event(Event.SLIDE, { var slideEvent = $.Event(Event.SLIDE, {
relatedTarget: relatedTarget, relatedTarget: relatedTarget,
direction: eventDirectionName direction: eventDirectionName,
from: fromIndex,
to: targetIndex
}); });
$(this._element).trigger(slideEvent); $(this._element).trigger(slideEvent);
@ -817,8 +821,9 @@ var Carousel = function ($) {
var _this5 = this; var _this5 = this;
var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0]; var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0];
var activeElementIndex = this._getItemIndex(activeElement);
var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement); var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
var nextElementIndex = this._getItemIndex(nextElement);
var isCycling = Boolean(this._interval); var isCycling = Boolean(this._interval);
var directionalClassName = void 0; var directionalClassName = void 0;
@ -860,7 +865,9 @@ var Carousel = function ($) {
var slidEvent = $.Event(Event.SLID, { var slidEvent = $.Event(Event.SLID, {
relatedTarget: nextElement, relatedTarget: nextElement,
direction: eventDirectionName direction: eventDirectionName,
from: activeElementIndex,
to: nextElementIndex
}); });
if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) { if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) {
@ -1854,6 +1861,10 @@ var Modal = function ($) {
this._scrollbarWidth = null; this._scrollbarWidth = null;
}; };
Modal.prototype.handleUpdate = function handleUpdate() {
this._adjustDialog();
};
// private // private
Modal.prototype._getConfig = function _getConfig(config) { Modal.prototype._getConfig = function _getConfig(config) {
@ -1935,7 +1946,7 @@ var Modal = function ($) {
if (this._isShown) { if (this._isShown) {
$(window).on(Event.RESIZE, function (event) { $(window).on(Event.RESIZE, function (event) {
return _this14._handleUpdate(event); return _this14.handleUpdate(event);
}); });
} else { } else {
$(window).off(Event.RESIZE); $(window).off(Event.RESIZE);
@ -2036,10 +2047,6 @@ var Modal = function ($) {
// todo (fat): these should probably be refactored out of modal.js // todo (fat): these should probably be refactored out of modal.js
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
Modal.prototype._handleUpdate = function _handleUpdate() {
this._adjustDialog();
};
Modal.prototype._adjustDialog = function _adjustDialog() { Modal.prototype._adjustDialog = function _adjustDialog() {
var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight; var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;

File diff suppressed because one or more lines are too long

13
js/dist/carousel.js vendored
View file

@ -272,9 +272,13 @@ var Carousel = function ($) {
}; };
Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) { Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
var targetIndex = this._getItemIndex(relatedTarget);
var fromIndex = this._getItemIndex($(this._element).find(Selector.ACTIVE_ITEM)[0]);
var slideEvent = $.Event(Event.SLIDE, { var slideEvent = $.Event(Event.SLIDE, {
relatedTarget: relatedTarget, relatedTarget: relatedTarget,
direction: eventDirectionName direction: eventDirectionName,
from: fromIndex,
to: targetIndex
}); });
$(this._element).trigger(slideEvent); $(this._element).trigger(slideEvent);
@ -298,8 +302,9 @@ var Carousel = function ($) {
var _this3 = this; var _this3 = this;
var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0]; var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0];
var activeElementIndex = this._getItemIndex(activeElement);
var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement); var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
var nextElementIndex = this._getItemIndex(nextElement);
var isCycling = Boolean(this._interval); var isCycling = Boolean(this._interval);
var directionalClassName = void 0; var directionalClassName = void 0;
@ -341,7 +346,9 @@ var Carousel = function ($) {
var slidEvent = $.Event(Event.SLID, { var slidEvent = $.Event(Event.SLID, {
relatedTarget: nextElement, relatedTarget: nextElement,
direction: eventDirectionName direction: eventDirectionName,
from: activeElementIndex,
to: nextElementIndex
}); });
if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) { if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) {

File diff suppressed because one or more lines are too long

10
js/dist/modal.js vendored
View file

@ -209,6 +209,10 @@ var Modal = function ($) {
this._scrollbarWidth = null; this._scrollbarWidth = null;
}; };
Modal.prototype.handleUpdate = function handleUpdate() {
this._adjustDialog();
};
// private // private
Modal.prototype._getConfig = function _getConfig(config) { Modal.prototype._getConfig = function _getConfig(config) {
@ -290,7 +294,7 @@ var Modal = function ($) {
if (this._isShown) { if (this._isShown) {
$(window).on(Event.RESIZE, function (event) { $(window).on(Event.RESIZE, function (event) {
return _this6._handleUpdate(event); return _this6.handleUpdate(event);
}); });
} else { } else {
$(window).off(Event.RESIZE); $(window).off(Event.RESIZE);
@ -391,10 +395,6 @@ var Modal = function ($) {
// todo (fat): these should probably be refactored out of modal.js // todo (fat): these should probably be refactored out of modal.js
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
Modal.prototype._handleUpdate = function _handleUpdate() {
this._adjustDialog();
};
Modal.prototype._adjustDialog = function _adjustDialog() { Modal.prototype._adjustDialog = function _adjustDialog() {
var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight; var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;

File diff suppressed because one or more lines are too long