Commit f0518132 authored by Mario's avatar Mario
Browse files

update to latest bs-dev

parent 33d23a4a
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -791,9 +791,13 @@ var Carousel = function ($) {
};
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, {
relatedTarget: relatedTarget,
direction: eventDirectionName
direction: eventDirectionName,
from: fromIndex,
to: targetIndex
});
$(this._element).trigger(slideEvent);
......@@ -817,8 +821,9 @@ var Carousel = function ($) {
var _this5 = this;
var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0];
var activeElementIndex = this._getItemIndex(activeElement);
var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
var nextElementIndex = this._getItemIndex(nextElement);
var isCycling = Boolean(this._interval);
var directionalClassName = void 0;
......@@ -860,7 +865,9 @@ var Carousel = function ($) {
var slidEvent = $.Event(Event.SLID, {
relatedTarget: nextElement,
direction: eventDirectionName
direction: eventDirectionName,
from: activeElementIndex,
to: nextElementIndex
});
if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) {
......@@ -1337,7 +1344,9 @@ var Collapse = function ($) {
*/
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault();
if (/input|textarea/i.test(event.target.tagName)) {
event.preventDefault();
}
var target = Collapse._getTargetFromElement(this);
var data = $(target).data(DATA_KEY);
......@@ -1854,6 +1863,10 @@ var Modal = function ($) {
this._scrollbarWidth = null;
};
Modal.prototype.handleUpdate = function handleUpdate() {
this._adjustDialog();
};
// private
Modal.prototype._getConfig = function _getConfig(config) {
......@@ -1935,7 +1948,7 @@ var Modal = function ($) {
if (this._isShown) {
$(window).on(Event.RESIZE, function (event) {
return _this14._handleUpdate(event);
return _this14.handleUpdate(event);
});
} else {
$(window).off(Event.RESIZE);
......@@ -2036,10 +2049,6 @@ var Modal = function ($) {
// todo (fat): these should probably be refactored out of modal.js
// ----------------------------------------------------------------------
Modal.prototype._handleUpdate = function _handleUpdate() {
this._adjustDialog();
};
Modal.prototype._adjustDialog = function _adjustDialog() {
var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;
......
This diff is collapsed.
......@@ -9,8 +9,8 @@ nav .badge {
@media screen and (min-width: 767px) {
nav .badge {
top: -0.25rem;
left: -0.25rem;
top: 0px;
left: 0px;
}
}
......
......@@ -8,7 +8,7 @@
<body <?php if($page['direction']) echo 'dir="rtl"' ?> >
<?php if(x($page,'banner')) echo $page['banner']; ?>
<header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar fixed-top navbar-toggleable-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<nav class="navbar fixed-top navbar-expand-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main>
<aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
......
......@@ -7,7 +7,7 @@
</head>
<body>
<header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar fixed-top navbar-toggleable-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<nav class="navbar fixed-top navbar-expand-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<section><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
</section>
......
......@@ -1211,12 +1211,12 @@ a.active:hover .dropdown-sub-text {
}
.usermenu {
width: 3.5rem;
width: 3.75rem;
}
#avatar {
width: 2.2rem;
height: 2.2rem;
width: 2.35rem;
height: 2.35rem;
border-radius: $radius;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment