diff --git a/bootstrap/js/bootstrap.js b/bootstrap/js/bootstrap.js
index 4139b6fc..68bf8eee 100644
--- a/bootstrap/js/bootstrap.js
+++ b/bootstrap/js/bootstrap.js
@@ -10,7 +10,7 @@ if (typeof jQuery === 'undefined') {
+function ($) {
'use strict';
- var version = $.fn.jquery.split(' ')[0].split('.')
+ var version = $.fn.jquery.split(' ')[0].split('.');
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')
}
@@ -32,14 +32,14 @@ if (typeof jQuery === 'undefined') {
// ============================================================
function transitionEnd() {
- var el = document.createElement('bootstrap')
+ var el = document.createElement('bootstrap');
var transEndEventNames = {
WebkitTransition : 'webkitTransitionEnd',
MozTransition : 'transitionend',
OTransition : 'oTransitionEnd otransitionend',
transition : 'transitionend'
- }
+ };
for (var name in transEndEventNames) {
if (el.style[name] !== undefined) {
@@ -47,23 +47,23 @@ if (typeof jQuery === 'undefined') {
}
}
- return false // explicit for ie8 ( ._.)
+ return false; // explicit for ie8 ( ._.)
}
// http://blog.alexmaccaw.com/css-transitions
$.fn.emulateTransitionEnd = function (duration) {
- var called = false
- var $el = this
- $(this).one('bsTransitionEnd', function () { called = true })
- var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
- setTimeout(callback, duration)
+ var called = false;
+ var $el = this;
+ $(this).one('bsTransitionEnd', function () { called = true });
+ var callback = function () { if (!called) $($el).trigger($.support.transition.end) };
+ setTimeout(callback, duration);
return this
- }
+ };
$(function () {
- $.support.transition = transitionEnd()
+ $.support.transition = transitionEnd();
- if (!$.support.transition) return
+ if (!$.support.transition) return;
$.event.special.bsTransitionEnd = {
bindType: $.support.transition.end,
@@ -91,37 +91,37 @@ if (typeof jQuery === 'undefined') {
// ALERT CLASS DEFINITION
// ======================
- var dismiss = '[data-dismiss="alert"]'
+ var dismiss = '[data-dismiss="alert"]';
var Alert = function (el) {
$(el).on('click', dismiss, this.close)
- }
+ };
- Alert.VERSION = '3.3.2'
+ Alert.VERSION = '3.3.2';
- Alert.TRANSITION_DURATION = 150
+ Alert.TRANSITION_DURATION = 150;
Alert.prototype.close = function (e) {
- var $this = $(this)
- var selector = $this.attr('data-target')
+ var $this = $(this);
+ var selector = $this.attr('data-target');
if (!selector) {
- selector = $this.attr('href')
- selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+ selector = $this.attr('href');
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, ''); // strip for ie7
}
- var $parent = $(selector)
+ var $parent = $(selector);
- if (e) e.preventDefault()
+ if (e) e.preventDefault();
if (!$parent.length) {
$parent = $this.closest('.alert')
}
- $parent.trigger(e = $.Event('close.bs.alert'))
+ $parent.trigger(e = $.Event('close.bs.alert'));
- if (e.isDefaultPrevented()) return
+ if (e.isDefaultPrevented()) return;
- $parent.removeClass('in')
+ $parent.removeClass('in');
function removeElement() {
// detach from parent, fire event then clean up data
@@ -133,7 +133,7 @@ if (typeof jQuery === 'undefined') {
.one('bsTransitionEnd', removeElement)
.emulateTransitionEnd(Alert.TRANSITION_DURATION) :
removeElement()
- }
+ };
// ALERT PLUGIN DEFINITION
@@ -141,27 +141,27 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.alert')
+ var $this = $(this);
+ var data = $this.data('bs.alert');
- if (!data) $this.data('bs.alert', (data = new Alert(this)))
+ if (!data) $this.data('bs.alert', (data = new Alert(this)));
if (typeof option == 'string') data[option].call($this)
})
}
- var old = $.fn.alert
+ var old = $.fn.alert;
- $.fn.alert = Plugin
- $.fn.alert.Constructor = Alert
+ $.fn.alert = Plugin;
+ $.fn.alert.Constructor = Alert;
// ALERT NO CONFLICT
// =================
$.fn.alert.noConflict = function () {
- $.fn.alert = old
+ $.fn.alert = old;
return this
- }
+ };
// ALERT DATA-API
@@ -187,49 +187,49 @@ if (typeof jQuery === 'undefined') {
// ==============================
var Button = function (element, options) {
- this.$element = $(element)
- this.options = $.extend({}, Button.DEFAULTS, options)
+ this.$element = $(element);
+ this.options = $.extend({}, Button.DEFAULTS, options);
this.isLoading = false
- }
+ };
- Button.VERSION = '3.3.2'
+ Button.VERSION = '3.3.2';
Button.DEFAULTS = {
loadingText: 'loading...'
- }
+ };
Button.prototype.setState = function (state) {
- var d = 'disabled'
- var $el = this.$element
- var val = $el.is('input') ? 'val' : 'html'
- var data = $el.data()
+ var d = 'disabled';
+ var $el = this.$element;
+ var val = $el.is('input') ? 'val' : 'html';
+ var data = $el.data();
- state = state + 'Text'
+ state = state + 'Text';
- if (data.resetText == null) $el.data('resetText', $el[val]())
+ if (data.resetText == null) $el.data('resetText', $el[val]());
// push to event loop to allow forms to submit
setTimeout($.proxy(function () {
- $el[val](data[state] == null ? this.options[state] : data[state])
+ $el[val](data[state] == null ? this.options[state] : data[state]);
if (state == 'loadingText') {
- this.isLoading = true
+ this.isLoading = true;
$el.addClass(d).attr(d, d)
} else if (this.isLoading) {
- this.isLoading = false
+ this.isLoading = false;
$el.removeClass(d).removeAttr(d)
}
}, this), 0)
- }
+ };
Button.prototype.toggle = function () {
- var changed = true
- var $parent = this.$element.closest('[data-toggle="buttons"]')
+ var changed = true;
+ var $parent = this.$element.closest('[data-toggle="buttons"]');
if ($parent.length) {
- var $input = this.$element.find('input')
+ var $input = this.$element.find('input');
if ($input.prop('type') == 'radio') {
- if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
+ if ($input.prop('checked') && this.$element.hasClass('active')) changed = false;
else $parent.find('.active').removeClass('active')
}
if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
@@ -238,7 +238,7 @@ if (typeof jQuery === 'undefined') {
}
if (changed) this.$element.toggleClass('active')
- }
+ };
// BUTTON PLUGIN DEFINITION
@@ -246,30 +246,30 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.button')
- var options = typeof option == 'object' && option
+ var $this = $(this);
+ var data = $this.data('bs.button');
+ var options = typeof option == 'object' && option;
- if (!data) $this.data('bs.button', (data = new Button(this, options)))
+ if (!data) $this.data('bs.button', (data = new Button(this, options)));
- if (option == 'toggle') data.toggle()
+ if (option == 'toggle') data.toggle();
else if (option) data.setState(option)
})
}
- var old = $.fn.button
+ var old = $.fn.button;
- $.fn.button = Plugin
- $.fn.button.Constructor = Button
+ $.fn.button = Plugin;
+ $.fn.button.Constructor = Button;
// BUTTON NO CONFLICT
// ==================
$.fn.button.noConflict = function () {
- $.fn.button = old
+ $.fn.button = old;
return this
- }
+ };
// BUTTON DATA-API
@@ -277,9 +277,9 @@ if (typeof jQuery === 'undefined') {
$(document)
.on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
- var $btn = $(e.target)
- if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
- Plugin.call($btn, 'toggle')
+ var $btn = $(e.target);
+ if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn');
+ Plugin.call($btn, 'toggle');
e.preventDefault()
})
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
@@ -304,160 +304,160 @@ if (typeof jQuery === 'undefined') {
// =========================
var Carousel = function (element, options) {
- this.$element = $(element)
- this.$indicators = this.$element.find('.carousel-indicators')
- this.options = options
+ this.$element = $(element);
+ this.$indicators = this.$element.find('.carousel-indicators');
+ this.options = options;
this.paused =
this.sliding =
this.interval =
this.$active =
- this.$items = null
+ this.$items = null;
- this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
+ this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this));
this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
.on('mouseenter.bs.carousel', $.proxy(this.pause, this))
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
- }
+ };
- Carousel.VERSION = '3.3.2'
+ Carousel.VERSION = '3.3.2';
- Carousel.TRANSITION_DURATION = 600
+ Carousel.TRANSITION_DURATION = 600;
Carousel.DEFAULTS = {
interval: 5000,
pause: 'hover',
wrap: true,
keyboard: true
- }
+ };
Carousel.prototype.keydown = function (e) {
- if (/input|textarea/i.test(e.target.tagName)) return
+ if (/input|textarea/i.test(e.target.tagName)) return;
switch (e.which) {
- case 37: this.prev(); break
- case 39: this.next(); break
+ case 37: this.prev(); break;
+ case 39: this.next(); break;
default: return
}
e.preventDefault()
- }
+ };
Carousel.prototype.cycle = function (e) {
- e || (this.paused = false)
+ e || (this.paused = false);
- this.interval && clearInterval(this.interval)
+ this.interval && clearInterval(this.interval);
this.options.interval
&& !this.paused
- && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+ && (this.interval = setInterval($.proxy(this.next, this), this.options.interval));
return this
- }
+ };
Carousel.prototype.getItemIndex = function (item) {
- this.$items = item.parent().children('.item')
+ this.$items = item.parent().children('.item');
return this.$items.index(item || this.$active)
- }
+ };
Carousel.prototype.getItemForDirection = function (direction, active) {
- var activeIndex = this.getItemIndex(active)
+ var activeIndex = this.getItemIndex(active);
var willWrap = (direction == 'prev' && activeIndex === 0)
- || (direction == 'next' && activeIndex == (this.$items.length - 1))
- if (willWrap && !this.options.wrap) return active
- var delta = direction == 'prev' ? -1 : 1
- var itemIndex = (activeIndex + delta) % this.$items.length
+ || (direction == 'next' && activeIndex == (this.$items.length - 1));
+ if (willWrap && !this.options.wrap) return active;
+ var delta = direction == 'prev' ? -1 : 1;
+ var itemIndex = (activeIndex + delta) % this.$items.length;
return this.$items.eq(itemIndex)
- }
+ };
Carousel.prototype.to = function (pos) {
- var that = this
- var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
+ var that = this;
+ var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'));
- if (pos > (this.$items.length - 1) || pos < 0) return
+ if (pos > (this.$items.length - 1) || pos < 0) return;
- if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
- if (activeIndex == pos) return this.pause().cycle()
+ if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }); // yes, "slid"
+ if (activeIndex == pos) return this.pause().cycle();
return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos))
- }
+ };
Carousel.prototype.pause = function (e) {
- e || (this.paused = true)
+ e || (this.paused = true);
if (this.$element.find('.next, .prev').length && $.support.transition) {
- this.$element.trigger($.support.transition.end)
+ this.$element.trigger($.support.transition.end);
this.cycle(true)
}
- this.interval = clearInterval(this.interval)
+ this.interval = clearInterval(this.interval);
return this
- }
+ };
Carousel.prototype.next = function () {
- if (this.sliding) return
+ if (this.sliding) return;
return this.slide('next')
- }
+ };
Carousel.prototype.prev = function () {
- if (this.sliding) return
+ if (this.sliding) return;
return this.slide('prev')
- }
+ };
Carousel.prototype.slide = function (type, next) {
- var $active = this.$element.find('.item.active')
- var $next = next || this.getItemForDirection(type, $active)
- var isCycling = this.interval
- var direction = type == 'next' ? 'left' : 'right'
- var that = this
+ var $active = this.$element.find('.item.active');
+ var $next = next || this.getItemForDirection(type, $active);
+ var isCycling = this.interval;
+ var direction = type == 'next' ? 'left' : 'right';
+ var that = this;
- if ($next.hasClass('active')) return (this.sliding = false)
+ if ($next.hasClass('active')) return (this.sliding = false);
- var relatedTarget = $next[0]
+ var relatedTarget = $next[0];
var slideEvent = $.Event('slide.bs.carousel', {
relatedTarget: relatedTarget,
direction: direction
- })
- this.$element.trigger(slideEvent)
- if (slideEvent.isDefaultPrevented()) return
+ });
+ this.$element.trigger(slideEvent);
+ if (slideEvent.isDefaultPrevented()) return;
- this.sliding = true
+ this.sliding = true;
- isCycling && this.pause()
+ isCycling && this.pause();
if (this.$indicators.length) {
- this.$indicators.find('.active').removeClass('active')
- var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
+ this.$indicators.find('.active').removeClass('active');
+ var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)]);
$nextIndicator && $nextIndicator.addClass('active')
}
- var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
+ var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }); // yes, "slid"
if ($.support.transition && this.$element.hasClass('slide')) {
- $next.addClass(type)
- $next[0].offsetWidth // force reflow
- $active.addClass(direction)
- $next.addClass(direction)
+ $next.addClass(type);
+ $next[0].offsetWidth; // force reflow
+ $active.addClass(direction);
+ $next.addClass(direction);
$active
.one('bsTransitionEnd', function () {
- $next.removeClass([type, direction].join(' ')).addClass('active')
- $active.removeClass(['active', direction].join(' '))
- that.sliding = false
+ $next.removeClass([type, direction].join(' ')).addClass('active');
+ $active.removeClass(['active', direction].join(' '));
+ that.sliding = false;
setTimeout(function () {
that.$element.trigger(slidEvent)
}, 0)
})
.emulateTransitionEnd(Carousel.TRANSITION_DURATION)
} else {
- $active.removeClass('active')
- $next.addClass('active')
- this.sliding = false
+ $active.removeClass('active');
+ $next.addClass('active');
+ this.sliding = false;
this.$element.trigger(slidEvent)
}
- isCycling && this.cycle()
+ isCycling && this.cycle();
return this
- }
+ };
// CAROUSEL PLUGIN DEFINITION
@@ -465,61 +465,61 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.carousel')
- var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
- var action = typeof option == 'string' ? option : options.slide
+ var $this = $(this);
+ var data = $this.data('bs.carousel');
+ var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option);
+ var action = typeof option == 'string' ? option : options.slide;
- if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
- if (typeof option == 'number') data.to(option)
- else if (action) data[action]()
+ if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)));
+ if (typeof option == 'number') data.to(option);
+ else if (action) data[action]();
else if (options.interval) data.pause().cycle()
})
}
- var old = $.fn.carousel
+ var old = $.fn.carousel;
- $.fn.carousel = Plugin
- $.fn.carousel.Constructor = Carousel
+ $.fn.carousel = Plugin;
+ $.fn.carousel.Constructor = Carousel;
// CAROUSEL NO CONFLICT
// ====================
$.fn.carousel.noConflict = function () {
- $.fn.carousel = old
+ $.fn.carousel = old;
return this
- }
+ };
// CAROUSEL DATA-API
// =================
var clickHandler = function (e) {
- var href
- var $this = $(this)
- var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
- if (!$target.hasClass('carousel')) return
- var options = $.extend({}, $target.data(), $this.data())
- var slideIndex = $this.attr('data-slide-to')
- if (slideIndex) options.interval = false
+ var href;
+ var $this = $(this);
+ var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')); // strip for ie7
+ if (!$target.hasClass('carousel')) return;
+ var options = $.extend({}, $target.data(), $this.data());
+ var slideIndex = $this.attr('data-slide-to');
+ if (slideIndex) options.interval = false;
- Plugin.call($target, options)
+ Plugin.call($target, options);
if (slideIndex) {
$target.data('bs.carousel').to(slideIndex)
}
e.preventDefault()
- }
+ };
$(document)
.on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
- .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
+ .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler);
$(window).on('load', function () {
$('[data-ride="carousel"]').each(function () {
- var $carousel = $(this)
+ var $carousel = $(this);
Plugin.call($carousel, $carousel.data())
})
})
@@ -542,10 +542,10 @@ if (typeof jQuery === 'undefined') {
// ================================
var Collapse = function (element, options) {
- this.$element = $(element)
- this.options = $.extend({}, Collapse.DEFAULTS, options)
- this.$trigger = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]')
- this.transitioning = null
+ this.$element = $(element);
+ this.options = $.extend({}, Collapse.DEFAULTS, options);
+ this.$trigger = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]');
+ this.transitioning = null;
if (this.options.parent) {
this.$parent = this.getParent()
@@ -554,138 +554,138 @@ if (typeof jQuery === 'undefined') {
}
if (this.options.toggle) this.toggle()
- }
+ };
- Collapse.VERSION = '3.3.2'
+ Collapse.VERSION = '3.3.2';
- Collapse.TRANSITION_DURATION = 350
+ Collapse.TRANSITION_DURATION = 350;
Collapse.DEFAULTS = {
toggle: true,
trigger: '[data-toggle="collapse"]'
- }
+ };
Collapse.prototype.dimension = function () {
- var hasWidth = this.$element.hasClass('width')
+ var hasWidth = this.$element.hasClass('width');
return hasWidth ? 'width' : 'height'
- }
+ };
Collapse.prototype.show = function () {
- if (this.transitioning || this.$element.hasClass('in')) return
+ if (this.transitioning || this.$element.hasClass('in')) return;
- var activesData
- var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
+ var activesData;
+ var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing');
if (actives && actives.length) {
- activesData = actives.data('bs.collapse')
+ activesData = actives.data('bs.collapse');
if (activesData && activesData.transitioning) return
}
- var startEvent = $.Event('show.bs.collapse')
- this.$element.trigger(startEvent)
- if (startEvent.isDefaultPrevented()) return
+ var startEvent = $.Event('show.bs.collapse');
+ this.$element.trigger(startEvent);
+ if (startEvent.isDefaultPrevented()) return;
if (actives && actives.length) {
- Plugin.call(actives, 'hide')
+ Plugin.call(actives, 'hide');
activesData || actives.data('bs.collapse', null)
}
- var dimension = this.dimension()
+ var dimension = this.dimension();
this.$element
.removeClass('collapse')
.addClass('collapsing')[dimension](0)
- .attr('aria-expanded', true)
+ .attr('aria-expanded', true);
this.$trigger
.removeClass('collapsed')
- .attr('aria-expanded', true)
+ .attr('aria-expanded', true);
- this.transitioning = 1
+ this.transitioning = 1;
var complete = function () {
this.$element
.removeClass('collapsing')
- .addClass('collapse in')[dimension]('')
- this.transitioning = 0
+ .addClass('collapse in')[dimension]('');
+ this.transitioning = 0;
this.$element
.trigger('shown.bs.collapse')
- }
+ };
- if (!$.support.transition) return complete.call(this)
+ if (!$.support.transition) return complete.call(this);
- var scrollSize = $.camelCase(['scroll', dimension].join('-'))
+ var scrollSize = $.camelCase(['scroll', dimension].join('-'));
this.$element
.one('bsTransitionEnd', $.proxy(complete, this))
.emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize])
- }
+ };
Collapse.prototype.hide = function () {
- if (this.transitioning || !this.$element.hasClass('in')) return
+ if (this.transitioning || !this.$element.hasClass('in')) return;
- var startEvent = $.Event('hide.bs.collapse')
- this.$element.trigger(startEvent)
- if (startEvent.isDefaultPrevented()) return
+ var startEvent = $.Event('hide.bs.collapse');
+ this.$element.trigger(startEvent);
+ if (startEvent.isDefaultPrevented()) return;
- var dimension = this.dimension()
+ var dimension = this.dimension();
- this.$element[dimension](this.$element[dimension]())[0].offsetHeight
+ this.$element[dimension](this.$element[dimension]())[0].offsetHeight;
this.$element
.addClass('collapsing')
.removeClass('collapse in')
- .attr('aria-expanded', false)
+ .attr('aria-expanded', false);
this.$trigger
.addClass('collapsed')
- .attr('aria-expanded', false)
+ .attr('aria-expanded', false);
- this.transitioning = 1
+ this.transitioning = 1;
var complete = function () {
- this.transitioning = 0
+ this.transitioning = 0;
this.$element
.removeClass('collapsing')
.addClass('collapse')
.trigger('hidden.bs.collapse')
- }
+ };
- if (!$.support.transition) return complete.call(this)
+ if (!$.support.transition) return complete.call(this);
this.$element
[dimension](0)
.one('bsTransitionEnd', $.proxy(complete, this))
.emulateTransitionEnd(Collapse.TRANSITION_DURATION)
- }
+ };
Collapse.prototype.toggle = function () {
this[this.$element.hasClass('in') ? 'hide' : 'show']()
- }
+ };
Collapse.prototype.getParent = function () {
return $(this.options.parent)
.find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
.each($.proxy(function (i, element) {
- var $element = $(element)
+ var $element = $(element);
this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
}, this))
.end()
- }
+ };
Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
- var isOpen = $element.hasClass('in')
+ var isOpen = $element.hasClass('in');
- $element.attr('aria-expanded', isOpen)
+ $element.attr('aria-expanded', isOpen);
$trigger
.toggleClass('collapsed', !isOpen)
.attr('aria-expanded', isOpen)
- }
+ };
function getTargetFromTrigger($trigger) {
- var href
+ var href;
var target = $trigger.attr('data-target')
- || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
+ || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, ''); // strip for ie7
return $(target)
}
@@ -696,42 +696,42 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.collapse')
- var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
+ var $this = $(this);
+ var data = $this.data('bs.collapse');
+ var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option);
- if (!data && options.toggle && option == 'show') options.toggle = false
- if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
+ if (!data && options.toggle && option == 'show') options.toggle = false;
+ if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)));
if (typeof option == 'string') data[option]()
})
}
- var old = $.fn.collapse
+ var old = $.fn.collapse;
- $.fn.collapse = Plugin
- $.fn.collapse.Constructor = Collapse
+ $.fn.collapse = Plugin;
+ $.fn.collapse.Constructor = Collapse;
// COLLAPSE NO CONFLICT
// ====================
$.fn.collapse.noConflict = function () {
- $.fn.collapse = old
+ $.fn.collapse = old;
return this
- }
+ };
// COLLAPSE DATA-API
// =================
$(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
- var $this = $(this)
+ var $this = $(this);
- if (!$this.attr('data-target')) e.preventDefault()
+ if (!$this.attr('data-target')) e.preventDefault();
- var $target = getTargetFromTrigger($this)
- var data = $target.data('bs.collapse')
- var option = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })
+ var $target = getTargetFromTrigger($this);
+ var data = $target.data('bs.collapse');
+ var option = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this });
Plugin.call($target, option)
})
@@ -753,23 +753,23 @@ if (typeof jQuery === 'undefined') {
// DROPDOWN CLASS DEFINITION
// =========================
- var backdrop = '.dropdown-backdrop'
- var toggle = '[data-toggle="dropdown"]'
+ var backdrop = '.dropdown-backdrop';
+ var toggle = '[data-toggle="dropdown"]';
var Dropdown = function (element) {
$(element).on('click.bs.dropdown', this.toggle)
- }
+ };
- Dropdown.VERSION = '3.3.2'
+ Dropdown.VERSION = '3.3.2';
Dropdown.prototype.toggle = function (e) {
- var $this = $(this)
+ var $this = $(this);
- if ($this.is('.disabled, :disabled')) return
+ if ($this.is('.disabled, :disabled')) return;
- var $parent = getParent($this)
- var isActive = $parent.hasClass('open')
+ var $parent = getParent($this);
+ var isActive = $parent.hasClass('open');
- clearMenus()
+ clearMenus();
if (!isActive) {
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
@@ -777,14 +777,14 @@ if (typeof jQuery === 'undefined') {
$('').insertAfter($(this)).on('click', clearMenus)
}
- var relatedTarget = { relatedTarget: this }
- $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
+ var relatedTarget = { relatedTarget: this };
+ $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget));
- if (e.isDefaultPrevented()) return
+ if (e.isDefaultPrevented()) return;
$this
.trigger('focus')
- .attr('aria-expanded', 'true')
+ .attr('aria-expanded', 'true');
$parent
.toggleClass('open')
@@ -792,68 +792,68 @@ if (typeof jQuery === 'undefined') {
}
return false
- }
+ };
Dropdown.prototype.keydown = function (e) {
- if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
+ if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return;
- var $this = $(this)
+ var $this = $(this);
- e.preventDefault()
- e.stopPropagation()
+ e.preventDefault();
+ e.stopPropagation();
- if ($this.is('.disabled, :disabled')) return
+ if ($this.is('.disabled, :disabled')) return;
- var $parent = getParent($this)
- var isActive = $parent.hasClass('open')
+ var $parent = getParent($this);
+ var isActive = $parent.hasClass('open');
if ((!isActive && e.which != 27) || (isActive && e.which == 27)) {
- if (e.which == 27) $parent.find(toggle).trigger('focus')
+ if (e.which == 27) $parent.find(toggle).trigger('focus');
return $this.trigger('click')
}
- var desc = ' li:not(.divider):visible a'
- var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc)
+ var desc = ' li:not(.divider):visible a';
+ var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc);
- if (!$items.length) return
+ if (!$items.length) return;
- var index = $items.index(e.target)
+ var index = $items.index(e.target);
- if (e.which == 38 && index > 0) index-- // up
- if (e.which == 40 && index < $items.length - 1) index++ // down
- if (!~index) index = 0
+ if (e.which == 38 && index > 0) index--; // up
+ if (e.which == 40 && index < $items.length - 1) index++; // down
+ if (!~index) index = 0;
$items.eq(index).trigger('focus')
- }
+ };
function clearMenus(e) {
- if (e && e.which === 3) return
- $(backdrop).remove()
+ if (e && e.which === 3) return;
+ $(backdrop).remove();
$(toggle).each(function () {
- var $this = $(this)
- var $parent = getParent($this)
- var relatedTarget = { relatedTarget: this }
+ var $this = $(this);
+ var $parent = getParent($this);
+ var relatedTarget = { relatedTarget: this };
- if (!$parent.hasClass('open')) return
+ if (!$parent.hasClass('open')) return;
- $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
+ $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget));
- if (e.isDefaultPrevented()) return
+ if (e.isDefaultPrevented()) return;
- $this.attr('aria-expanded', 'false')
+ $this.attr('aria-expanded', 'false');
$parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
})
}
function getParent($this) {
- var selector = $this.attr('data-target')
+ var selector = $this.attr('data-target');
if (!selector) {
- selector = $this.attr('href')
- selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+ selector = $this.attr('href');
+ selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, ''); // strip for ie7
}
- var $parent = selector && $(selector)
+ var $parent = selector && $(selector);
return $parent && $parent.length ? $parent : $this.parent()
}
@@ -864,27 +864,27 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.dropdown')
+ var $this = $(this);
+ var data = $this.data('bs.dropdown');
- if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
+ if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)));
if (typeof option == 'string') data[option].call($this)
})
}
- var old = $.fn.dropdown
+ var old = $.fn.dropdown;
- $.fn.dropdown = Plugin
- $.fn.dropdown.Constructor = Dropdown
+ $.fn.dropdown = Plugin;
+ $.fn.dropdown.Constructor = Dropdown;
// DROPDOWN NO CONFLICT
// ====================
$.fn.dropdown.noConflict = function () {
- $.fn.dropdown = old
+ $.fn.dropdown = old;
return this
- }
+ };
// APPLY TO STANDARD DROPDOWN ELEMENTS
@@ -916,12 +916,12 @@ if (typeof jQuery === 'undefined') {
// ======================
var Modal = function (element, options) {
- this.options = options
- this.$body = $(document.body)
- this.$element = $(element)
+ this.options = options;
+ this.$body = $(document.body);
+ this.$element = $(element);
this.$backdrop =
- this.isShown = null
- this.scrollbarWidth = 0
+ this.isShown = null;
+ this.scrollbarWidth = 0;
if (this.options.remote) {
this.$element
@@ -930,67 +930,67 @@ if (typeof jQuery === 'undefined') {
this.$element.trigger('loaded.bs.modal')
}, this))
}
- }
+ };
- Modal.VERSION = '3.3.2'
+ Modal.VERSION = '3.3.2';
- Modal.TRANSITION_DURATION = 300
- Modal.BACKDROP_TRANSITION_DURATION = 150
+ Modal.TRANSITION_DURATION = 300;
+ Modal.BACKDROP_TRANSITION_DURATION = 150;
Modal.DEFAULTS = {
backdrop: true,
keyboard: true,
show: true
- }
+ };
Modal.prototype.toggle = function (_relatedTarget) {
return this.isShown ? this.hide() : this.show(_relatedTarget)
- }
+ };
Modal.prototype.show = function (_relatedTarget) {
- var that = this
- var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
+ var that = this;
+ var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget });
- this.$element.trigger(e)
+ this.$element.trigger(e);
- if (this.isShown || e.isDefaultPrevented()) return
+ if (this.isShown || e.isDefaultPrevented()) return;
- this.isShown = true
+ this.isShown = true;
- this.checkScrollbar()
- this.setScrollbar()
- this.$body.addClass('modal-open')
+ this.checkScrollbar();
+ this.setScrollbar();
+ this.$body.addClass('modal-open');
- this.escape()
- this.resize()
+ this.escape();
+ this.resize();
- this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+ this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this));
this.backdrop(function () {
- var transition = $.support.transition && that.$element.hasClass('fade')
+ var transition = $.support.transition && that.$element.hasClass('fade');
if (!that.$element.parent().length) {
- that.$element.appendTo(that.$body) // don't move modals dom position
+ that.$element.appendTo(that.$body); // don't move modals dom position
}
that.$element
.show()
- .scrollTop(0)
+ .scrollTop(0);
- if (that.options.backdrop) that.adjustBackdrop()
- that.adjustDialog()
+ if (that.options.backdrop) that.adjustBackdrop();
+ that.adjustDialog();
if (transition) {
- that.$element[0].offsetWidth // force reflow
+ that.$element[0].offsetWidth; // force reflow
}
that.$element
.addClass('in')
- .attr('aria-hidden', false)
+ .attr('aria-hidden', false);
- that.enforceFocus()
+ that.enforceFocus();
- var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+ var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget });
transition ?
that.$element.find('.modal-dialog') // wait for modal to slide in
@@ -1000,35 +1000,35 @@ if (typeof jQuery === 'undefined') {
.emulateTransitionEnd(Modal.TRANSITION_DURATION) :
that.$element.trigger('focus').trigger(e)
})
- }
+ };
Modal.prototype.hide = function (e) {
- if (e) e.preventDefault()
+ if (e) e.preventDefault();
- e = $.Event('hide.bs.modal')
+ e = $.Event('hide.bs.modal');
- this.$element.trigger(e)
+ this.$element.trigger(e);
- if (!this.isShown || e.isDefaultPrevented()) return
+ if (!this.isShown || e.isDefaultPrevented()) return;
- this.isShown = false
+ this.isShown = false;
- this.escape()
- this.resize()
+ this.escape();
+ this.resize();
- $(document).off('focusin.bs.modal')
+ $(document).off('focusin.bs.modal');
this.$element
.removeClass('in')
.attr('aria-hidden', true)
- .off('click.dismiss.bs.modal')
+ .off('click.dismiss.bs.modal');
$.support.transition && this.$element.hasClass('fade') ?
this.$element
.one('bsTransitionEnd', $.proxy(this.hideModal, this))
.emulateTransitionEnd(Modal.TRANSITION_DURATION) :
this.hideModal()
- }
+ };
Modal.prototype.enforceFocus = function () {
$(document)
@@ -1038,7 +1038,7 @@ if (typeof jQuery === 'undefined') {
this.$element.trigger('focus')
}
}, this))
- }
+ };
Modal.prototype.escape = function () {
if (this.isShown && this.options.keyboard) {
@@ -1048,7 +1048,7 @@ if (typeof jQuery === 'undefined') {
} else if (!this.isShown) {
this.$element.off('keydown.dismiss.bs.modal')
}
- }
+ };
Modal.prototype.resize = function () {
if (this.isShown) {
@@ -1056,45 +1056,45 @@ if (typeof jQuery === 'undefined') {
} else {
$(window).off('resize.bs.modal')
}
- }
+ };
Modal.prototype.hideModal = function () {
- var that = this
- this.$element.hide()
+ var that = this;
+ this.$element.hide();
this.backdrop(function () {
- that.$body.removeClass('modal-open')
- that.resetAdjustments()
- that.resetScrollbar()
+ that.$body.removeClass('modal-open');
+ that.resetAdjustments();
+ that.resetScrollbar();
that.$element.trigger('hidden.bs.modal')
})
- }
+ };
Modal.prototype.removeBackdrop = function () {
- this.$backdrop && this.$backdrop.remove()
+ this.$backdrop && this.$backdrop.remove();
this.$backdrop = null
- }
+ };
Modal.prototype.backdrop = function (callback) {
- var that = this
- var animate = this.$element.hasClass('fade') ? 'fade' : ''
+ var that = this;
+ var animate = this.$element.hasClass('fade') ? 'fade' : '';
if (this.isShown && this.options.backdrop) {
- var doAnimate = $.support.transition && animate
+ var doAnimate = $.support.transition && animate;
this.$backdrop = $('')
.prependTo(this.$element)
.on('click.dismiss.bs.modal', $.proxy(function (e) {
- if (e.target !== e.currentTarget) return
+ if (e.target !== e.currentTarget) return;
this.options.backdrop == 'static'
? this.$element[0].focus.call(this.$element[0])
: this.hide.call(this)
- }, this))
+ }, this));
- if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+ if (doAnimate) this.$backdrop[0].offsetWidth; // force reflow
- this.$backdrop.addClass('in')
+ this.$backdrop.addClass('in');
- if (!callback) return
+ if (!callback) return;
doAnimate ?
this.$backdrop
@@ -1103,12 +1103,12 @@ if (typeof jQuery === 'undefined') {
callback()
} else if (!this.isShown && this.$backdrop) {
- this.$backdrop.removeClass('in')
+ this.$backdrop.removeClass('in');
var callbackRemove = function () {
- that.removeBackdrop()
+ that.removeBackdrop();
callback && callback()
- }
+ };
$.support.transition && this.$element.hasClass('fade') ?
this.$backdrop
.one('bsTransitionEnd', callbackRemove)
@@ -1118,59 +1118,59 @@ if (typeof jQuery === 'undefined') {
} else if (callback) {
callback()
}
- }
+ };
// these following methods are used to handle overflowing modals
Modal.prototype.handleUpdate = function () {
- if (this.options.backdrop) this.adjustBackdrop()
+ if (this.options.backdrop) this.adjustBackdrop();
this.adjustDialog()
- }
+ };
Modal.prototype.adjustBackdrop = function () {
this.$backdrop
.css('height', 0)
.css('height', this.$element[0].scrollHeight)
- }
+ };
Modal.prototype.adjustDialog = function () {
- var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
+ var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight;
this.$element.css({
paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
})
- }
+ };
Modal.prototype.resetAdjustments = function () {
this.$element.css({
paddingLeft: '',
paddingRight: ''
})
- }
+ };
Modal.prototype.checkScrollbar = function () {
- this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight
+ this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight;
this.scrollbarWidth = this.measureScrollbar()
- }
+ };
Modal.prototype.setScrollbar = function () {
- var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
+ var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10);
if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
- }
+ };
Modal.prototype.resetScrollbar = function () {
this.$body.css('padding-right', '')
- }
+ };
Modal.prototype.measureScrollbar = function () { // thx walsh
- var scrollDiv = document.createElement('div')
- scrollDiv.className = 'modal-scrollbar-measure'
- this.$body.append(scrollDiv)
- var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
- this.$body[0].removeChild(scrollDiv)
+ var scrollDiv = document.createElement('div');
+ scrollDiv.className = 'modal-scrollbar-measure';
+ this.$body.append(scrollDiv);
+ var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth;
+ this.$body[0].removeChild(scrollDiv);
return scrollbarWidth
- }
+ };
// MODAL PLUGIN DEFINITION
@@ -1178,48 +1178,48 @@ if (typeof jQuery === 'undefined') {
function Plugin(option, _relatedTarget) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.modal')
- var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
+ var $this = $(this);
+ var data = $this.data('bs.modal');
+ var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option);
- if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
- if (typeof option == 'string') data[option](_relatedTarget)
+ if (!data) $this.data('bs.modal', (data = new Modal(this, options)));
+ if (typeof option == 'string') data[option](_relatedTarget);
else if (options.show) data.show(_relatedTarget)
})
}
- var old = $.fn.modal
+ var old = $.fn.modal;
- $.fn.modal = Plugin
- $.fn.modal.Constructor = Modal
+ $.fn.modal = Plugin;
+ $.fn.modal.Constructor = Modal;
// MODAL NO CONFLICT
// =================
$.fn.modal.noConflict = function () {
- $.fn.modal = old
+ $.fn.modal = old;
return this
- }
+ };
// MODAL DATA-API
// ==============
$(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
- var $this = $(this)
- var href = $this.attr('href')
- var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
- var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
+ var $this = $(this);
+ var href = $this.attr('href');
+ var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))); // strip for ie7
+ var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data());
- if ($this.is('a')) e.preventDefault()
+ if ($this.is('a')) e.preventDefault();
$target.one('show.bs.modal', function (showEvent) {
- if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
+ if (showEvent.isDefaultPrevented()) return; // only register focus restorer if modal will actually get shown
$target.one('hidden.bs.modal', function () {
$this.is(':visible') && $this.trigger('focus')
})
- })
+ });
Plugin.call($target, option, this)
})
@@ -1247,14 +1247,14 @@ if (typeof jQuery === 'undefined') {
this.enabled =
this.timeout =
this.hoverState =
- this.$element = null
+ this.$element = null;
this.init('tooltip', element, options)
- }
+ };
- Tooltip.VERSION = '3.3.2'
+ Tooltip.VERSION = '3.3.2';
- Tooltip.TRANSITION_DURATION = 150
+ Tooltip.TRANSITION_DURATION = 150;
Tooltip.DEFAULTS = {
animation: true,
@@ -1270,27 +1270,27 @@ if (typeof jQuery === 'undefined') {
selector: 'body',
padding: 0
}
- }
+ };
Tooltip.prototype.init = function (type, element, options) {
- this.enabled = true
- this.type = type
- this.$element = $(element)
- this.options = this.getOptions(options)
- this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport)
+ this.enabled = true;
+ this.type = type;
+ this.$element = $(element);
+ this.options = this.getOptions(options);
+ this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport);
- var triggers = this.options.trigger.split(' ')
+ var triggers = this.options.trigger.split(' ');
for (var i = triggers.length; i--;) {
- var trigger = triggers[i]
+ var trigger = triggers[i];
if (trigger == 'click') {
this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
} else if (trigger != 'manual') {
- var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin'
- var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
+ var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin';
+ var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout';
- this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+ this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this));
this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
}
}
@@ -1298,14 +1298,14 @@ if (typeof jQuery === 'undefined') {
this.options.selector ?
(this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
this.fixTitle()
- }
+ };
Tooltip.prototype.getDefaults = function () {
return Tooltip.DEFAULTS
- }
+ };
Tooltip.prototype.getOptions = function (options) {
- options = $.extend({}, this.getDefaults(), this.$element.data(), options)
+ options = $.extend({}, this.getDefaults(), this.$element.data(), options);
if (options.delay && typeof options.delay == 'number') {
options.delay = {
@@ -1315,131 +1315,131 @@ if (typeof jQuery === 'undefined') {
}
return options
- }
+ };
Tooltip.prototype.getDelegateOptions = function () {
- var options = {}
- var defaults = this.getDefaults()
+ var options = {};
+ var defaults = this.getDefaults();
this._options && $.each(this._options, function (key, value) {
if (defaults[key] != value) options[key] = value
- })
+ });
return options
- }
+ };
Tooltip.prototype.enter = function (obj) {
var self = obj instanceof this.constructor ?
- obj : $(obj.currentTarget).data('bs.' + this.type)
+ obj : $(obj.currentTarget).data('bs.' + this.type);
if (self && self.$tip && self.$tip.is(':visible')) {
- self.hoverState = 'in'
+ self.hoverState = 'in';
return
}
if (!self) {
- self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
+ self = new this.constructor(obj.currentTarget, this.getDelegateOptions());
$(obj.currentTarget).data('bs.' + this.type, self)
}
- clearTimeout(self.timeout)
+ clearTimeout(self.timeout);
- self.hoverState = 'in'
+ self.hoverState = 'in';
- if (!self.options.delay || !self.options.delay.show) return self.show()
+ if (!self.options.delay || !self.options.delay.show) return self.show();
self.timeout = setTimeout(function () {
if (self.hoverState == 'in') self.show()
}, self.options.delay.show)
- }
+ };
Tooltip.prototype.leave = function (obj) {
var self = obj instanceof this.constructor ?
- obj : $(obj.currentTarget).data('bs.' + this.type)
+ obj : $(obj.currentTarget).data('bs.' + this.type);
if (!self) {
- self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
+ self = new this.constructor(obj.currentTarget, this.getDelegateOptions());
$(obj.currentTarget).data('bs.' + this.type, self)
}
- clearTimeout(self.timeout)
+ clearTimeout(self.timeout);
- self.hoverState = 'out'
+ self.hoverState = 'out';
- if (!self.options.delay || !self.options.delay.hide) return self.hide()
+ if (!self.options.delay || !self.options.delay.hide) return self.hide();
self.timeout = setTimeout(function () {
if (self.hoverState == 'out') self.hide()
}, self.options.delay.hide)
- }
+ };
Tooltip.prototype.show = function () {
- var e = $.Event('show.bs.' + this.type)
+ var e = $.Event('show.bs.' + this.type);
if (this.hasContent() && this.enabled) {
- this.$element.trigger(e)
+ this.$element.trigger(e);
- var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0])
- if (e.isDefaultPrevented() || !inDom) return
- var that = this
+ var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]);
+ if (e.isDefaultPrevented() || !inDom) return;
+ var that = this;
- var $tip = this.tip()
+ var $tip = this.tip();
- var tipId = this.getUID(this.type)
+ var tipId = this.getUID(this.type);
- this.setContent()
- $tip.attr('id', tipId)
- this.$element.attr('aria-describedby', tipId)
+ this.setContent();
+ $tip.attr('id', tipId);
+ this.$element.attr('aria-describedby', tipId);
- if (this.options.animation) $tip.addClass('fade')
+ if (this.options.animation) $tip.addClass('fade');
var placement = typeof this.options.placement == 'function' ?
this.options.placement.call(this, $tip[0], this.$element[0]) :
- this.options.placement
+ this.options.placement;
- var autoToken = /\s?auto?\s?/i
- var autoPlace = autoToken.test(placement)
- if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
+ var autoToken = /\s?auto?\s?/i;
+ var autoPlace = autoToken.test(placement);
+ if (autoPlace) placement = placement.replace(autoToken, '') || 'top';
$tip
.detach()
.css({ top: 0, left: 0, display: 'block' })
.addClass(placement)
- .data('bs.' + this.type, this)
+ .data('bs.' + this.type, this);
- this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+ this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element);
- var pos = this.getPosition()
- var actualWidth = $tip[0].offsetWidth
- var actualHeight = $tip[0].offsetHeight
+ var pos = this.getPosition();
+ var actualWidth = $tip[0].offsetWidth;
+ var actualHeight = $tip[0].offsetHeight;
if (autoPlace) {
- var orgPlacement = placement
- var $container = this.options.container ? $(this.options.container) : this.$element.parent()
- var containerDim = this.getPosition($container)
+ var orgPlacement = placement;
+ var $container = this.options.container ? $(this.options.container) : this.$element.parent();
+ var containerDim = this.getPosition($container);
placement = placement == 'bottom' && pos.bottom + actualHeight > containerDim.bottom ? 'top' :
placement == 'top' && pos.top - actualHeight < containerDim.top ? 'bottom' :
placement == 'right' && pos.right + actualWidth > containerDim.width ? 'left' :
placement == 'left' && pos.left - actualWidth < containerDim.left ? 'right' :
- placement
+ placement;
$tip
.removeClass(orgPlacement)
.addClass(placement)
}
- var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
+ var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight);
- this.applyPlacement(calculatedOffset, placement)
+ this.applyPlacement(calculatedOffset, placement);
var complete = function () {
- var prevHoverState = that.hoverState
- that.$element.trigger('shown.bs.' + that.type)
- that.hoverState = null
+ var prevHoverState = that.hoverState;
+ that.$element.trigger('shown.bs.' + that.type);
+ that.hoverState = null;
if (prevHoverState == 'out') that.leave(that)
- }
+ };
$.support.transition && this.$tip.hasClass('fade') ?
$tip
@@ -1447,23 +1447,23 @@ if (typeof jQuery === 'undefined') {
.emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
complete()
}
- }
+ };
Tooltip.prototype.applyPlacement = function (offset, placement) {
- var $tip = this.tip()
- var width = $tip[0].offsetWidth
- var height = $tip[0].offsetHeight
+ var $tip = this.tip();
+ var width = $tip[0].offsetWidth;
+ var height = $tip[0].offsetHeight;
// manually read margins because getBoundingClientRect includes difference
- var marginTop = parseInt($tip.css('margin-top'), 10)
- var marginLeft = parseInt($tip.css('margin-left'), 10)
+ var marginTop = parseInt($tip.css('margin-top'), 10);
+ var marginLeft = parseInt($tip.css('margin-left'), 10);
// we must check for NaN for ie 8/9
- if (isNaN(marginTop)) marginTop = 0
- if (isNaN(marginLeft)) marginLeft = 0
+ if (isNaN(marginTop)) marginTop = 0;
+ if (isNaN(marginLeft)) marginLeft = 0;
- offset.top = offset.top + marginTop
- offset.left = offset.left + marginLeft
+ offset.top = offset.top + marginTop;
+ offset.left = offset.left + marginLeft;
// $.fn.offset doesn't round pixel values
// so we use setOffset directly with our own function B-0
@@ -1474,103 +1474,103 @@ if (typeof jQuery === 'undefined') {
left: Math.round(props.left)
})
}
- }, offset), 0)
+ }, offset), 0);
- $tip.addClass('in')
+ $tip.addClass('in');
// check to see if placing tip in new offset caused the tip to resize itself
- var actualWidth = $tip[0].offsetWidth
- var actualHeight = $tip[0].offsetHeight
+ var actualWidth = $tip[0].offsetWidth;
+ var actualHeight = $tip[0].offsetHeight;
if (placement == 'top' && actualHeight != height) {
offset.top = offset.top + height - actualHeight
}
- var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight)
+ var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight);
- if (delta.left) offset.left += delta.left
- else offset.top += delta.top
+ if (delta.left) offset.left += delta.left;
+ else offset.top += delta.top;
- var isVertical = /top|bottom/.test(placement)
- var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
- var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'
+ var isVertical = /top|bottom/.test(placement);
+ var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight;
+ var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight';
- $tip.offset(offset)
+ $tip.offset(offset);
this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
- }
+ };
Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) {
this.arrow()
.css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
.css(isHorizontal ? 'top' : 'left', '')
- }
+ };
Tooltip.prototype.setContent = function () {
- var $tip = this.tip()
- var title = this.getTitle()
+ var $tip = this.tip();
+ var title = this.getTitle();
- $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+ $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title);
$tip.removeClass('fade in top bottom left right')
- }
+ };
Tooltip.prototype.hide = function (callback) {
- var that = this
- var $tip = this.tip()
- var e = $.Event('hide.bs.' + this.type)
+ var that = this;
+ var $tip = this.tip();
+ var e = $.Event('hide.bs.' + this.type);
function complete() {
- if (that.hoverState != 'in') $tip.detach()
+ if (that.hoverState != 'in') $tip.detach();
that.$element
.removeAttr('aria-describedby')
- .trigger('hidden.bs.' + that.type)
+ .trigger('hidden.bs.' + that.type);
callback && callback()
}
- this.$element.trigger(e)
+ this.$element.trigger(e);
- if (e.isDefaultPrevented()) return
+ if (e.isDefaultPrevented()) return;
- $tip.removeClass('in')
+ $tip.removeClass('in');
$.support.transition && this.$tip.hasClass('fade') ?
$tip
.one('bsTransitionEnd', complete)
.emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
- complete()
+ complete();
- this.hoverState = null
+ this.hoverState = null;
return this
- }
+ };
Tooltip.prototype.fixTitle = function () {
- var $e = this.$element
+ var $e = this.$element;
if ($e.attr('title') || typeof ($e.attr('data-original-title')) != 'string') {
$e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
}
- }
+ };
Tooltip.prototype.hasContent = function () {
return this.getTitle()
- }
+ };
Tooltip.prototype.getPosition = function ($element) {
- $element = $element || this.$element
+ $element = $element || this.$element;
- var el = $element[0]
- var isBody = el.tagName == 'BODY'
+ var el = $element[0];
+ var isBody = el.tagName == 'BODY';
- var elRect = el.getBoundingClientRect()
+ var elRect = el.getBoundingClientRect();
if (elRect.width == null) {
// width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
}
- var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
- var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
- var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
+ var elOffset = isBody ? { top: 0, left: 0 } : $element.offset();
+ var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() };
+ var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null;
return $.extend({}, elRect, scroll, outerDims, elOffset)
- }
+ };
Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
@@ -1578,26 +1578,26 @@ if (typeof jQuery === 'undefined') {
placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
- }
+ };
Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) {
- var delta = { top: 0, left: 0 }
- if (!this.$viewport) return delta
+ var delta = { top: 0, left: 0 };
+ if (!this.$viewport) return delta;
- var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
- var viewportDimensions = this.getPosition(this.$viewport)
+ var viewportPadding = this.options.viewport && this.options.viewport.padding || 0;
+ var viewportDimensions = this.getPosition(this.$viewport);
if (/right|left/.test(placement)) {
- var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll
- var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight
+ var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll;
+ var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight;
if (topEdgeOffset < viewportDimensions.top) { // top overflow
delta.top = viewportDimensions.top - topEdgeOffset
} else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow
delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset
}
} else {
- var leftEdgeOffset = pos.left - viewportPadding
- var rightEdgeOffset = pos.left + viewportPadding + actualWidth
+ var leftEdgeOffset = pos.left - viewportPadding;
+ var rightEdgeOffset = pos.left + viewportPadding + actualWidth;
if (leftEdgeOffset < viewportDimensions.left) { // left overflow
delta.left = viewportDimensions.left - leftEdgeOffset
} else if (rightEdgeOffset > viewportDimensions.width) { // right overflow
@@ -1606,65 +1606,65 @@ if (typeof jQuery === 'undefined') {
}
return delta
- }
+ };
Tooltip.prototype.getTitle = function () {
- var title
- var $e = this.$element
- var o = this.options
+ var title;
+ var $e = this.$element;
+ var o = this.options;
title = $e.attr('data-original-title')
- || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
+ || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title);
return title
- }
+ };
Tooltip.prototype.getUID = function (prefix) {
- do prefix += ~~(Math.random() * 1000000)
- while (document.getElementById(prefix))
+ do prefix += ~~(Math.random() * 1000000);
+ while (document.getElementById(prefix));
return prefix
- }
+ };
Tooltip.prototype.tip = function () {
return (this.$tip = this.$tip || $(this.options.template))
- }
+ };
Tooltip.prototype.arrow = function () {
return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
- }
+ };
Tooltip.prototype.enable = function () {
this.enabled = true
- }
+ };
Tooltip.prototype.disable = function () {
this.enabled = false
- }
+ };
Tooltip.prototype.toggleEnabled = function () {
this.enabled = !this.enabled
- }
+ };
Tooltip.prototype.toggle = function (e) {
- var self = this
+ var self = this;
if (e) {
- self = $(e.currentTarget).data('bs.' + this.type)
+ self = $(e.currentTarget).data('bs.' + this.type);
if (!self) {
- self = new this.constructor(e.currentTarget, this.getDelegateOptions())
+ self = new this.constructor(e.currentTarget, this.getDelegateOptions());
$(e.currentTarget).data('bs.' + this.type, self)
}
}
self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
- }
+ };
Tooltip.prototype.destroy = function () {
- var that = this
- clearTimeout(this.timeout)
+ var that = this;
+ clearTimeout(this.timeout);
this.hide(function () {
that.$element.off('.' + that.type).removeData('bs.' + that.type)
})
- }
+ };
// TOOLTIP PLUGIN DEFINITION
@@ -1672,27 +1672,27 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.tooltip')
- var options = typeof option == 'object' && option
+ var $this = $(this);
+ var data = $this.data('bs.tooltip');
+ var options = typeof option == 'object' && option;
- if (!data && option == 'destroy') return
- if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
+ if (!data && option == 'destroy') return;
+ if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)));
if (typeof option == 'string') data[option]()
})
}
- var old = $.fn.tooltip
+ var old = $.fn.tooltip;
- $.fn.tooltip = Plugin
- $.fn.tooltip.Constructor = Tooltip
+ $.fn.tooltip = Plugin;
+ $.fn.tooltip.Constructor = Tooltip;
// TOOLTIP NO CONFLICT
// ===================
$.fn.tooltip.noConflict = function () {
- $.fn.tooltip = old
+ $.fn.tooltip = old;
return this
}
@@ -1715,70 +1715,70 @@ if (typeof jQuery === 'undefined') {
var Popover = function (element, options) {
this.init('popover', element, options)
- }
+ };
- if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
+ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js');
- Popover.VERSION = '3.3.2'
+ Popover.VERSION = '3.3.2';
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
trigger: 'click',
content: '',
template: ''
- })
+ });
// NOTE: POPOVER EXTENDS tooltip.js
// ================================
- Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
+ Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype);
- Popover.prototype.constructor = Popover
+ Popover.prototype.constructor = Popover;
Popover.prototype.getDefaults = function () {
return Popover.DEFAULTS
- }
+ };
Popover.prototype.setContent = function () {
- var $tip = this.tip()
- var title = this.getTitle()
- var content = this.getContent()
+ var $tip = this.tip();
+ var title = this.getTitle();
+ var content = this.getContent();
- $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+ $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title);
$tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
- ](content)
+ ](content);
- $tip.removeClass('fade top bottom left right in')
+ $tip.removeClass('fade top bottom left right in');
// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
// this manually by checking the contents.
if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
- }
+ };
Popover.prototype.hasContent = function () {
return this.getTitle() || this.getContent()
- }
+ };
Popover.prototype.getContent = function () {
- var $e = this.$element
- var o = this.options
+ var $e = this.$element;
+ var o = this.options;
return $e.attr('data-content')
|| (typeof o.content == 'function' ?
o.content.call($e[0]) :
o.content)
- }
+ };
Popover.prototype.arrow = function () {
return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
- }
+ };
Popover.prototype.tip = function () {
- if (!this.$tip) this.$tip = $(this.options.template)
+ if (!this.$tip) this.$tip = $(this.options.template);
return this.$tip
- }
+ };
// POPOVER PLUGIN DEFINITION
@@ -1786,27 +1786,27 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.popover')
- var options = typeof option == 'object' && option
+ var $this = $(this);
+ var data = $this.data('bs.popover');
+ var options = typeof option == 'object' && option;
- if (!data && option == 'destroy') return
- if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
+ if (!data && option == 'destroy') return;
+ if (!data) $this.data('bs.popover', (data = new Popover(this, options)));
if (typeof option == 'string') data[option]()
})
}
- var old = $.fn.popover
+ var old = $.fn.popover;
- $.fn.popover = Plugin
- $.fn.popover.Constructor = Popover
+ $.fn.popover = Plugin;
+ $.fn.popover.Constructor = Popover;
// POPOVER NO CONFLICT
// ===================
$.fn.popover.noConflict = function () {
- $.fn.popover = old
+ $.fn.popover = old;
return this
}
@@ -1828,53 +1828,53 @@ if (typeof jQuery === 'undefined') {
// ==========================
function ScrollSpy(element, options) {
- var process = $.proxy(this.process, this)
+ var process = $.proxy(this.process, this);
- this.$body = $('body')
- this.$scrollElement = $(element).is('body') ? $(window) : $(element)
- this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
- this.selector = (this.options.target || '') + ' .nav li > a'
- this.offsets = []
- this.targets = []
- this.activeTarget = null
- this.scrollHeight = 0
+ this.$body = $('body');
+ this.$scrollElement = $(element).is('body') ? $(window) : $(element);
+ this.options = $.extend({}, ScrollSpy.DEFAULTS, options);
+ this.selector = (this.options.target || '') + ' .nav li > a';
+ this.offsets = [];
+ this.targets = [];
+ this.activeTarget = null;
+ this.scrollHeight = 0;
- this.$scrollElement.on('scroll.bs.scrollspy', process)
- this.refresh()
+ this.$scrollElement.on('scroll.bs.scrollspy', process);
+ this.refresh();
this.process()
}
- ScrollSpy.VERSION = '3.3.2'
+ ScrollSpy.VERSION = '3.3.2';
ScrollSpy.DEFAULTS = {
offset: 10
- }
+ };
ScrollSpy.prototype.getScrollHeight = function () {
return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
- }
+ };
ScrollSpy.prototype.refresh = function () {
- var offsetMethod = 'offset'
- var offsetBase = 0
+ var offsetMethod = 'offset';
+ var offsetBase = 0;
if (!$.isWindow(this.$scrollElement[0])) {
- offsetMethod = 'position'
+ offsetMethod = 'position';
offsetBase = this.$scrollElement.scrollTop()
}
- this.offsets = []
- this.targets = []
- this.scrollHeight = this.getScrollHeight()
+ this.offsets = [];
+ this.targets = [];
+ this.scrollHeight = this.getScrollHeight();
- var self = this
+ var self = this;
this.$body
.find(this.selector)
.map(function () {
- var $el = $(this)
- var href = $el.data('target') || $el.attr('href')
- var $href = /^#./.test(href) && $(href)
+ var $el = $(this);
+ var href = $el.data('target') || $el.attr('href');
+ var $href = /^#./.test(href) && $(href);
return ($href
&& $href.length
@@ -1883,19 +1883,19 @@ if (typeof jQuery === 'undefined') {
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {
- self.offsets.push(this[0])
+ self.offsets.push(this[0]);
self.targets.push(this[1])
})
- }
+ };
ScrollSpy.prototype.process = function () {
- var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
- var scrollHeight = this.getScrollHeight()
- var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height()
- var offsets = this.offsets
- var targets = this.targets
- var activeTarget = this.activeTarget
- var i
+ var scrollTop = this.$scrollElement.scrollTop() + this.options.offset;
+ var scrollHeight = this.getScrollHeight();
+ var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height();
+ var offsets = this.offsets;
+ var targets = this.targets;
+ var activeTarget = this.activeTarget;
+ var i;
if (this.scrollHeight != scrollHeight) {
this.refresh()
@@ -1906,7 +1906,7 @@ if (typeof jQuery === 'undefined') {
}
if (activeTarget && scrollTop < offsets[0]) {
- this.activeTarget = null
+ this.activeTarget = null;
return this.clear()
}
@@ -1916,20 +1916,20 @@ if (typeof jQuery === 'undefined') {
&& (!offsets[i + 1] || scrollTop <= offsets[i + 1])
&& this.activate(targets[i])
}
- }
+ };
ScrollSpy.prototype.activate = function (target) {
- this.activeTarget = target
+ this.activeTarget = target;
- this.clear()
+ this.clear();
var selector = this.selector +
'[data-target="' + target + '"],' +
- this.selector + '[href="' + target + '"]'
+ this.selector + '[href="' + target + '"]';
var active = $(selector)
.parents('li')
- .addClass('active')
+ .addClass('active');
if (active.parent('.dropdown-menu').length) {
active = active
@@ -1938,13 +1938,13 @@ if (typeof jQuery === 'undefined') {
}
active.trigger('activate.bs.scrollspy')
- }
+ };
ScrollSpy.prototype.clear = function () {
$(this.selector)
.parentsUntil(this.options.target, '.active')
.removeClass('active')
- }
+ };
// SCROLLSPY PLUGIN DEFINITION
@@ -1952,28 +1952,28 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.scrollspy')
- var options = typeof option == 'object' && option
+ var $this = $(this);
+ var data = $this.data('bs.scrollspy');
+ var options = typeof option == 'object' && option;
- if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
+ if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)));
if (typeof option == 'string') data[option]()
})
}
- var old = $.fn.scrollspy
+ var old = $.fn.scrollspy;
- $.fn.scrollspy = Plugin
- $.fn.scrollspy.Constructor = ScrollSpy
+ $.fn.scrollspy = Plugin;
+ $.fn.scrollspy.Constructor = ScrollSpy;
// SCROLLSPY NO CONFLICT
// =====================
$.fn.scrollspy.noConflict = function () {
- $.fn.scrollspy = old
+ $.fn.scrollspy = old;
return this
- }
+ };
// SCROLLSPY DATA-API
@@ -1981,7 +1981,7 @@ if (typeof jQuery === 'undefined') {
$(window).on('load.bs.scrollspy.data-api', function () {
$('[data-spy="scroll"]').each(function () {
- var $spy = $(this)
+ var $spy = $(this);
Plugin.call($spy, $spy.data())
})
})
@@ -2005,57 +2005,57 @@ if (typeof jQuery === 'undefined') {
var Tab = function (element) {
this.element = $(element)
- }
+ };
- Tab.VERSION = '3.3.2'
+ Tab.VERSION = '3.3.2';
- Tab.TRANSITION_DURATION = 150
+ Tab.TRANSITION_DURATION = 150;
Tab.prototype.show = function () {
- var $this = this.element
- var $ul = $this.closest('ul:not(.dropdown-menu)')
- var selector = $this.data('target')
+ var $this = this.element;
+ var $ul = $this.closest('ul:not(.dropdown-menu)');
+ var selector = $this.data('target');
if (!selector) {
- selector = $this.attr('href')
- selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+ selector = $this.attr('href');
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, ''); // strip for ie7
}
- if ($this.parent('li').hasClass('active')) return
+ if ($this.parent('li').hasClass('active')) return;
- var $previous = $ul.find('.active:last a')
+ var $previous = $ul.find('.active:last a');
var hideEvent = $.Event('hide.bs.tab', {
relatedTarget: $this[0]
- })
+ });
var showEvent = $.Event('show.bs.tab', {
relatedTarget: $previous[0]
- })
+ });
- $previous.trigger(hideEvent)
- $this.trigger(showEvent)
+ $previous.trigger(hideEvent);
+ $this.trigger(showEvent);
- if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
+ if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return;
- var $target = $(selector)
+ var $target = $(selector);
- this.activate($this.closest('li'), $ul)
+ this.activate($this.closest('li'), $ul);
this.activate($target, $target.parent(), function () {
$previous.trigger({
type: 'hidden.bs.tab',
relatedTarget: $this[0]
- })
+ });
$this.trigger({
type: 'shown.bs.tab',
relatedTarget: $previous[0]
})
})
- }
+ };
Tab.prototype.activate = function (element, container, callback) {
- var $active = container.find('> .active')
+ var $active = container.find('> .active');
var transition = callback
&& $.support.transition
- && (($active.length && $active.hasClass('fade')) || !!container.find('> .fade').length)
+ && (($active.length && $active.hasClass('fade')) || !!container.find('> .fade').length);
function next() {
$active
@@ -2064,15 +2064,15 @@ if (typeof jQuery === 'undefined') {
.removeClass('active')
.end()
.find('[data-toggle="tab"]')
- .attr('aria-expanded', false)
+ .attr('aria-expanded', false);
element
.addClass('active')
.find('[data-toggle="tab"]')
- .attr('aria-expanded', true)
+ .attr('aria-expanded', true);
if (transition) {
- element[0].offsetWidth // reflow for transition
+ element[0].offsetWidth; // reflow for transition
element.addClass('in')
} else {
element.removeClass('fade')
@@ -2094,10 +2094,10 @@ if (typeof jQuery === 'undefined') {
$active
.one('bsTransitionEnd', next)
.emulateTransitionEnd(Tab.TRANSITION_DURATION) :
- next()
+ next();
$active.removeClass('in')
- }
+ };
// TAB PLUGIN DEFINITION
@@ -2105,36 +2105,36 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.tab')
+ var $this = $(this);
+ var data = $this.data('bs.tab');
- if (!data) $this.data('bs.tab', (data = new Tab(this)))
+ if (!data) $this.data('bs.tab', (data = new Tab(this)));
if (typeof option == 'string') data[option]()
})
}
- var old = $.fn.tab
+ var old = $.fn.tab;
- $.fn.tab = Plugin
- $.fn.tab.Constructor = Tab
+ $.fn.tab = Plugin;
+ $.fn.tab.Constructor = Tab;
// TAB NO CONFLICT
// ===============
$.fn.tab.noConflict = function () {
- $.fn.tab = old
+ $.fn.tab = old;
return this
- }
+ };
// TAB DATA-API
// ============
var clickHandler = function (e) {
- e.preventDefault()
+ e.preventDefault();
Plugin.call($(this), 'show')
- }
+ };
$(document)
.on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
@@ -2158,90 +2158,90 @@ if (typeof jQuery === 'undefined') {
// ======================
var Affix = function (element, options) {
- this.options = $.extend({}, Affix.DEFAULTS, options)
+ this.options = $.extend({}, Affix.DEFAULTS, options);
this.$target = $(this.options.target)
.on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
- .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
+ .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this));
- this.$element = $(element)
+ this.$element = $(element);
this.affixed =
this.unpin =
- this.pinnedOffset = null
+ this.pinnedOffset = null;
this.checkPosition()
- }
+ };
- Affix.VERSION = '3.3.2'
+ Affix.VERSION = '3.3.2';
- Affix.RESET = 'affix affix-top affix-bottom'
+ Affix.RESET = 'affix affix-top affix-bottom';
Affix.DEFAULTS = {
offset: 0,
target: window
- }
+ };
Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) {
- var scrollTop = this.$target.scrollTop()
- var position = this.$element.offset()
- var targetHeight = this.$target.height()
+ var scrollTop = this.$target.scrollTop();
+ var position = this.$element.offset();
+ var targetHeight = this.$target.height();
- if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false
+ if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false;
if (this.affixed == 'bottom') {
- if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'
+ if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom';
return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom'
}
- var initializing = this.affixed == null
- var colliderTop = initializing ? scrollTop : position.top
- var colliderHeight = initializing ? targetHeight : height
+ var initializing = this.affixed == null;
+ var colliderTop = initializing ? scrollTop : position.top;
+ var colliderHeight = initializing ? targetHeight : height;
- if (offsetTop != null && scrollTop <= offsetTop) return 'top'
- if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
+ if (offsetTop != null && scrollTop <= offsetTop) return 'top';
+ if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom';
return false
- }
+ };
Affix.prototype.getPinnedOffset = function () {
- if (this.pinnedOffset) return this.pinnedOffset
- this.$element.removeClass(Affix.RESET).addClass('affix')
- var scrollTop = this.$target.scrollTop()
- var position = this.$element.offset()
+ if (this.pinnedOffset) return this.pinnedOffset;
+ this.$element.removeClass(Affix.RESET).addClass('affix');
+ var scrollTop = this.$target.scrollTop();
+ var position = this.$element.offset();
return (this.pinnedOffset = position.top - scrollTop)
- }
+ };
Affix.prototype.checkPositionWithEventLoop = function () {
setTimeout($.proxy(this.checkPosition, this), 1)
- }
+ };
Affix.prototype.checkPosition = function () {
- if (!this.$element.is(':visible')) return
+ if (!this.$element.is(':visible')) return;
- var height = this.$element.height()
- var offset = this.options.offset
- var offsetTop = offset.top
- var offsetBottom = offset.bottom
- var scrollHeight = $('body').height()
+ var height = this.$element.height();
+ var offset = this.options.offset;
+ var offsetTop = offset.top;
+ var offsetBottom = offset.bottom;
+ var scrollHeight = $('body').height();
- if (typeof offset != 'object') offsetBottom = offsetTop = offset
- if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
- if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
+ if (typeof offset != 'object') offsetBottom = offsetTop = offset;
+ if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element);
+ if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element);
- var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom)
+ var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom);
if (this.affixed != affix) {
- if (this.unpin != null) this.$element.css('top', '')
+ if (this.unpin != null) this.$element.css('top', '');
- var affixType = 'affix' + (affix ? '-' + affix : '')
- var e = $.Event(affixType + '.bs.affix')
+ var affixType = 'affix' + (affix ? '-' + affix : '');
+ var e = $.Event(affixType + '.bs.affix');
- this.$element.trigger(e)
+ this.$element.trigger(e);
- if (e.isDefaultPrevented()) return
+ if (e.isDefaultPrevented()) return;
- this.affixed = affix
- this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
+ this.affixed = affix;
+ this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null;
this.$element
.removeClass(Affix.RESET)
@@ -2254,7 +2254,7 @@ if (typeof jQuery === 'undefined') {
top: scrollHeight - height - offsetBottom
})
}
- }
+ };
// AFFIX PLUGIN DEFINITION
@@ -2262,28 +2262,28 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) {
return this.each(function () {
- var $this = $(this)
- var data = $this.data('bs.affix')
- var options = typeof option == 'object' && option
+ var $this = $(this);
+ var data = $this.data('bs.affix');
+ var options = typeof option == 'object' && option;
- if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
+ if (!data) $this.data('bs.affix', (data = new Affix(this, options)));
if (typeof option == 'string') data[option]()
})
}
- var old = $.fn.affix
+ var old = $.fn.affix;
- $.fn.affix = Plugin
- $.fn.affix.Constructor = Affix
+ $.fn.affix = Plugin;
+ $.fn.affix.Constructor = Affix;
// AFFIX NO CONFLICT
// =================
$.fn.affix.noConflict = function () {
- $.fn.affix = old
+ $.fn.affix = old;
return this
- }
+ };
// AFFIX DATA-API
@@ -2291,13 +2291,13 @@ if (typeof jQuery === 'undefined') {
$(window).on('load', function () {
$('[data-spy="affix"]').each(function () {
- var $spy = $(this)
- var data = $spy.data()
+ var $spy = $(this);
+ var data = $spy.data();
- data.offset = data.offset || {}
+ data.offset = data.offset || {};
- if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom
- if (data.offsetTop != null) data.offset.top = data.offsetTop
+ if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom;
+ if (data.offsetTop != null) data.offset.top = data.offsetTop;
Plugin.call($spy, data)
})
diff --git a/build/less/skins/skin-black.less b/build/less/skins/skin-black.less
index ccb4099d..fc59506f 100755
--- a/build/less/skins/skin-black.less
+++ b/build/less/skins/skin-black.less
@@ -11,32 +11,31 @@
.skin-black {
//Navbar & Logo
.main-header {
- .box-shadow(0px 1px 1px rgba(0, 0, 0, 0.0));
- border-bottom: 1px solid #ddd;
+ .box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
+
.navbar-toggle {
color: #333;
}
.navbar-brand {
color: #333;
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
> .navbar {
.navbar-variant(#fff; #333; #999; #fff);
- //border-bottom: 1px solid #ddd;
> .sidebar-toggle {
color: #333;
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.navbar-nav {
> li > a {
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
}
.navbar-custom-menu .navbar-nav,
.navbar-right {
> li {
> a {
- border-left: 1px solid #ddd;
+ border-left: 1px solid #eee;
border-right-width: 0;
}
}
@@ -44,7 +43,7 @@
}
> .logo {
.logo-variant(#fff; #333);
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
@media (max-width: @screen-header-collapse) {
.logo-variant(#222; #fff);
border-right: none;
diff --git a/dist/css/skins/_all-skins.css b/dist/css/skins/_all-skins.css
index 77fa0bf7..0571afd7 100644
--- a/dist/css/skins/_all-skins.css
+++ b/dist/css/skins/_all-skins.css
@@ -155,16 +155,15 @@
*/
/* skin-black navbar */
.skin-black .main-header {
- -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0);
- box-shadow: 0px 1px 1px rgba(0, 0, 0, 0);
- border-bottom: 1px solid #ddd;
+ -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
+ box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
}
.skin-black .main-header .navbar-toggle {
color: #333;
}
.skin-black .main-header .navbar-brand {
color: #333;
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar {
background-color: #ffffff;
@@ -193,21 +192,21 @@
}
.skin-black .main-header > .navbar > .sidebar-toggle {
color: #333;
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar .navbar-nav > li > a {
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black .main-header > .navbar .navbar-right > li > a {
- border-left: 1px solid #ddd;
+ border-left: 1px solid #eee;
border-right-width: 0;
}
.skin-black .main-header > .logo {
background-color: #ffffff;
color: #333333;
border-bottom: 0px solid transparent;
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.skin-black .main-header > .logo > a {
color: #333333;
diff --git a/dist/css/skins/_all-skins.min.css b/dist/css/skins/_all-skins.min.css
index 2b264812..1f65eb58 100644
--- a/dist/css/skins/_all-skins.min.css
+++ b/dist/css/skins/_all-skins.min.css
@@ -1 +1 @@
-.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header .logo{background-color:#367fa9;color:#fff;border-bottom:0 solid transparent}.skin-blue .main-header .logo>a{color:#fff}.skin-blue .main-header .logo:hover{background:#357ca5}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:transparent}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-blue .sidebar-menu>li>a:hover,.skin-blue .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#3c8dbc}.skin-blue .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-blue .wrapper,.skin-blue .main-sidebar,.skin-blue .left-side{background:#222d32}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-blue .sidebar-form input[type="text"],.skin-blue .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-blue .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-blue .sidebar-form input[type="text"]:focus,.skin-blue .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo>a{color:#fff}.skin-blue.layout-top-nav .main-header>.logo:hover{background:#3b8ab8}.skin-black .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0);box-shadow:0 1px 1px rgba(0,0,0,0);border-bottom:1px solid #ddd}.skin-black .main-header .navbar-toggle{color:#333}.skin-black .main-header .navbar-brand{color:#333;border-right:1px solid #ddd}.skin-black .main-header>.navbar{background-color:#fff}.skin-black .main-header>.navbar .nav>li>a{color:#333}.skin-black .main-header>.navbar .nav>li>a:hover,.skin-black .main-header>.navbar .nav>li>a:active,.skin-black .main-header>.navbar .nav>li>a:focus,.skin-black .main-header>.navbar .nav .open>a,.skin-black .main-header>.navbar .nav .open>a:hover,.skin-black .main-header>.navbar .nav .open>a:focus{background:#fff;color:#999}.skin-black .main-header>.navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-black .main-header>.navbar .sidebar-toggle{color:#333}.skin-black .main-header>.navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black .main-header>.navbar>.sidebar-toggle{color:#333;border-right:1px solid #ddd}.skin-black .main-header>.navbar .navbar-nav>li>a{border-right:1px solid #ddd}.skin-black .main-header>.navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black .main-header>.navbar .navbar-right>li>a{border-left:1px solid #ddd;border-right-width:0}.skin-black .main-header>.logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #ddd}.skin-black .main-header>.logo>a{color:#333}.skin-black .main-header>.logo:hover{background:#fcfcfc}@media (max-width:767px){.skin-black .main-header>.logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black .main-header>.logo>a{color:#fff}.skin-black .main-header>.logo:hover{background:#1f1f1f}}.skin-black .main-header li.user-header{background-color:#222}.skin-black .content-header{background:transparent;box-shadow:none}.skin-black .user-panel>.image>img{border:1px solid #444}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#eee}.skin-black .main-sidebar,.skin-black .left-side,.skin-black .wrapper{background:#222}.skin-black .sidebar>.sidebar-menu>li.header{background:#1d1d1d;color:rgba(255,255,255,0.4)}.skin-black .sidebar>.sidebar-menu>li>a{margin-right:1px;border-left:3px solid transparent}.skin-black .sidebar>.sidebar-menu>li>a:hover,.skin-black .sidebar>.sidebar-menu>li.active>a{color:#fff;background:#444;border-left-color:#fff}.skin-black .sidebar>.sidebar-menu>li>.treeview-menu{background:#333}.skin-black .sidebar a{color:#eee}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#ccc}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border-radius:3px;border:1px solid #3c3c3c;margin:10px 10px}.skin-black .sidebar-form input[type="text"],.skin-black .sidebar-form .btn{box-shadow:none;background-color:#3c3c3c;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-black .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-black .sidebar-form input[type="text"]:focus,.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-green .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header .logo{background-color:#008d4c;color:#fff;border-bottom:0 solid transparent}.skin-green .main-header .logo>a{color:#fff}.skin-green .main-header .logo:hover{background:#008749}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-green .sidebar-menu>li>a:hover,.skin-green .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#00a65a}.skin-green .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-green .wrapper,.skin-green .main-sidebar,.skin-green .left-side{background:#222d32}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-green .sidebar-form input[type="text"],.skin-green .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-green .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-green .sidebar-form input[type="text"]:focus,.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-red .main-header .navbar{background-color:#dd4b39}.skin-red .main-header .navbar .nav>li>a{color:#fff}.skin-red .main-header .navbar .nav>li>a:hover,.skin-red .main-header .navbar .nav>li>a:active,.skin-red .main-header .navbar .nav>li>a:focus,.skin-red .main-header .navbar .nav .open>a,.skin-red .main-header .navbar .nav .open>a:hover,.skin-red .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-red .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-red .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red .main-header .navbar .dropdown-menu li a:hover{background:#d73925}}.skin-red .main-header .logo{background-color:#d73925;color:#fff;border-bottom:0 solid transparent}.skin-red .main-header .logo>a{color:#fff}.skin-red .main-header .logo:hover{background:#d33724}.skin-red .main-header li.user-header{background-color:#dd4b39}.skin-red .content-header{background:transparent}.skin-red .user-panel>.info,.skin-red .user-panel>.info>a{color:#fff}.skin-red .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-red .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-red .sidebar-menu>li>a:hover,.skin-red .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#dd4b39}.skin-red .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-red .wrapper,.skin-red .main-sidebar,.skin-red .left-side{background:#222d32}.skin-red .sidebar a{color:#b8c7ce}.skin-red .sidebar a:hover{text-decoration:none}.skin-red .treeview-menu>li>a{color:#8aa4af}.skin-red .treeview-menu>li.active>a,.skin-red .treeview-menu>li>a:hover{color:#fff}.skin-red .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-red .sidebar-form input[type="text"],.skin-red .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-red .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-red .sidebar-form input[type="text"]:focus,.skin-red .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-yellow .main-header .navbar{background-color:#f39c12}.skin-yellow .main-header .navbar .nav>li>a{color:#fff}.skin-yellow .main-header .navbar .nav>li>a:hover,.skin-yellow .main-header .navbar .nav>li>a:active,.skin-yellow .main-header .navbar .nav>li>a:focus,.skin-yellow .main-header .navbar .nav .open>a,.skin-yellow .main-header .navbar .nav .open>a:hover,.skin-yellow .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-yellow .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{background-color:#e08e0b}@media (max-width:767px){.skin-yellow .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-yellow .main-header .navbar .dropdown-menu li a{color:#fff}.skin-yellow .main-header .navbar .dropdown-menu li a:hover{background:#e08e0b}}.skin-yellow .main-header .logo{background-color:#e08e0b;color:#fff;border-bottom:0 solid transparent}.skin-yellow .main-header .logo>a{color:#fff}.skin-yellow .main-header .logo:hover{background:#db8b0b}.skin-yellow .main-header li.user-header{background-color:#f39c12}.skin-yellow .content-header{background:transparent}.skin-yellow .user-panel>.info,.skin-yellow .user-panel>.info>a{color:#fff}.skin-yellow .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-yellow .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-yellow .sidebar-menu>li>a:hover,.skin-yellow .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#f39c12}.skin-yellow .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-yellow .wrapper,.skin-yellow .main-sidebar,.skin-yellow .left-side{background:#222d32}.skin-yellow .sidebar a{color:#b8c7ce}.skin-yellow .sidebar a:hover{text-decoration:none}.skin-yellow .treeview-menu>li>a{color:#8aa4af}.skin-yellow .treeview-menu>li.active>a,.skin-yellow .treeview-menu>li>a:hover{color:#fff}.skin-yellow .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-yellow .sidebar-form input[type="text"],.skin-yellow .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-yellow .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-yellow .sidebar-form input[type="text"]:focus,.skin-yellow .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-yellow .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-yellow .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-purple .main-header .navbar{background-color:#605ca8}.skin-purple .main-header .navbar .nav>li>a{color:#fff}.skin-purple .main-header .navbar .nav>li>a:hover,.skin-purple .main-header .navbar .nav>li>a:active,.skin-purple .main-header .navbar .nav>li>a:focus,.skin-purple .main-header .navbar .nav .open>a,.skin-purple .main-header .navbar .nav .open>a:hover,.skin-purple .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-purple .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-purple .main-header .navbar .dropdown-menu li a{color:#fff}.skin-purple .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple .main-header .logo{background-color:#555299;color:#fff;border-bottom:0 solid transparent}.skin-purple .main-header .logo>a{color:#fff}.skin-purple .main-header .logo:hover{background:#545096}.skin-purple .main-header li.user-header{background-color:#605ca8}.skin-purple .content-header{background:transparent}.skin-purple .user-panel>.info,.skin-purple .user-panel>.info>a{color:#fff}.skin-purple .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-purple .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-purple .sidebar-menu>li>a:hover,.skin-purple .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#605ca8}.skin-purple .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-purple .wrapper,.skin-purple .main-sidebar,.skin-purple .left-side{background:#222d32}.skin-purple .sidebar a{color:#b8c7ce}.skin-purple .sidebar a:hover{text-decoration:none}.skin-purple .treeview-menu>li>a{color:#8aa4af}.skin-purple .treeview-menu>li.active>a,.skin-purple .treeview-menu>li>a:hover{color:#fff}.skin-purple .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-purple .sidebar-form input[type="text"],.skin-purple .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-purple .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-purple .sidebar-form input[type="text"]:focus,.skin-purple .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}
\ No newline at end of file
+.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header .logo{background-color:#367fa9;color:#fff;border-bottom:0 solid transparent}.skin-blue .main-header .logo>a{color:#fff}.skin-blue .main-header .logo:hover{background:#357ca5}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:transparent}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-blue .sidebar-menu>li>a:hover,.skin-blue .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#3c8dbc}.skin-blue .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-blue .wrapper,.skin-blue .main-sidebar,.skin-blue .left-side{background:#222d32}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-blue .sidebar-form input[type="text"],.skin-blue .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-blue .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-blue .sidebar-form input[type="text"]:focus,.skin-blue .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo>a{color:#fff}.skin-blue.layout-top-nav .main-header>.logo:hover{background:#3b8ab8}.skin-black .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.skin-black .main-header .navbar-toggle{color:#333}.skin-black .main-header .navbar-brand{color:#333;border-right:1px solid #eee}.skin-black .main-header>.navbar{background-color:#fff}.skin-black .main-header>.navbar .nav>li>a{color:#333}.skin-black .main-header>.navbar .nav>li>a:hover,.skin-black .main-header>.navbar .nav>li>a:active,.skin-black .main-header>.navbar .nav>li>a:focus,.skin-black .main-header>.navbar .nav .open>a,.skin-black .main-header>.navbar .nav .open>a:hover,.skin-black .main-header>.navbar .nav .open>a:focus{background:#fff;color:#999}.skin-black .main-header>.navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-black .main-header>.navbar .sidebar-toggle{color:#333}.skin-black .main-header>.navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black .main-header>.navbar>.sidebar-toggle{color:#333;border-right:1px solid #eee}.skin-black .main-header>.navbar .navbar-nav>li>a{border-right:1px solid #eee}.skin-black .main-header>.navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black .main-header>.navbar .navbar-right>li>a{border-left:1px solid #eee;border-right-width:0}.skin-black .main-header>.logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #eee}.skin-black .main-header>.logo>a{color:#333}.skin-black .main-header>.logo:hover{background:#fcfcfc}@media (max-width:767px){.skin-black .main-header>.logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black .main-header>.logo>a{color:#fff}.skin-black .main-header>.logo:hover{background:#1f1f1f}}.skin-black .main-header li.user-header{background-color:#222}.skin-black .content-header{background:transparent;box-shadow:none}.skin-black .user-panel>.image>img{border:1px solid #444}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#eee}.skin-black .main-sidebar,.skin-black .left-side,.skin-black .wrapper{background:#222}.skin-black .sidebar>.sidebar-menu>li.header{background:#1d1d1d;color:rgba(255,255,255,0.4)}.skin-black .sidebar>.sidebar-menu>li>a{margin-right:1px;border-left:3px solid transparent}.skin-black .sidebar>.sidebar-menu>li>a:hover,.skin-black .sidebar>.sidebar-menu>li.active>a{color:#fff;background:#444;border-left-color:#fff}.skin-black .sidebar>.sidebar-menu>li>.treeview-menu{background:#333}.skin-black .sidebar a{color:#eee}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#ccc}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border-radius:3px;border:1px solid #3c3c3c;margin:10px 10px}.skin-black .sidebar-form input[type="text"],.skin-black .sidebar-form .btn{box-shadow:none;background-color:#3c3c3c;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-black .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-black .sidebar-form input[type="text"]:focus,.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-green .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header .logo{background-color:#008d4c;color:#fff;border-bottom:0 solid transparent}.skin-green .main-header .logo>a{color:#fff}.skin-green .main-header .logo:hover{background:#008749}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-green .sidebar-menu>li>a:hover,.skin-green .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#00a65a}.skin-green .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-green .wrapper,.skin-green .main-sidebar,.skin-green .left-side{background:#222d32}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-green .sidebar-form input[type="text"],.skin-green .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-green .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-green .sidebar-form input[type="text"]:focus,.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-red .main-header .navbar{background-color:#dd4b39}.skin-red .main-header .navbar .nav>li>a{color:#fff}.skin-red .main-header .navbar .nav>li>a:hover,.skin-red .main-header .navbar .nav>li>a:active,.skin-red .main-header .navbar .nav>li>a:focus,.skin-red .main-header .navbar .nav .open>a,.skin-red .main-header .navbar .nav .open>a:hover,.skin-red .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-red .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-red .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red .main-header .navbar .dropdown-menu li a:hover{background:#d73925}}.skin-red .main-header .logo{background-color:#d73925;color:#fff;border-bottom:0 solid transparent}.skin-red .main-header .logo>a{color:#fff}.skin-red .main-header .logo:hover{background:#d33724}.skin-red .main-header li.user-header{background-color:#dd4b39}.skin-red .content-header{background:transparent}.skin-red .user-panel>.info,.skin-red .user-panel>.info>a{color:#fff}.skin-red .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-red .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-red .sidebar-menu>li>a:hover,.skin-red .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#dd4b39}.skin-red .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-red .wrapper,.skin-red .main-sidebar,.skin-red .left-side{background:#222d32}.skin-red .sidebar a{color:#b8c7ce}.skin-red .sidebar a:hover{text-decoration:none}.skin-red .treeview-menu>li>a{color:#8aa4af}.skin-red .treeview-menu>li.active>a,.skin-red .treeview-menu>li>a:hover{color:#fff}.skin-red .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-red .sidebar-form input[type="text"],.skin-red .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-red .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-red .sidebar-form input[type="text"]:focus,.skin-red .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-yellow .main-header .navbar{background-color:#f39c12}.skin-yellow .main-header .navbar .nav>li>a{color:#fff}.skin-yellow .main-header .navbar .nav>li>a:hover,.skin-yellow .main-header .navbar .nav>li>a:active,.skin-yellow .main-header .navbar .nav>li>a:focus,.skin-yellow .main-header .navbar .nav .open>a,.skin-yellow .main-header .navbar .nav .open>a:hover,.skin-yellow .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-yellow .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{background-color:#e08e0b}@media (max-width:767px){.skin-yellow .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-yellow .main-header .navbar .dropdown-menu li a{color:#fff}.skin-yellow .main-header .navbar .dropdown-menu li a:hover{background:#e08e0b}}.skin-yellow .main-header .logo{background-color:#e08e0b;color:#fff;border-bottom:0 solid transparent}.skin-yellow .main-header .logo>a{color:#fff}.skin-yellow .main-header .logo:hover{background:#db8b0b}.skin-yellow .main-header li.user-header{background-color:#f39c12}.skin-yellow .content-header{background:transparent}.skin-yellow .user-panel>.info,.skin-yellow .user-panel>.info>a{color:#fff}.skin-yellow .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-yellow .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-yellow .sidebar-menu>li>a:hover,.skin-yellow .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#f39c12}.skin-yellow .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-yellow .wrapper,.skin-yellow .main-sidebar,.skin-yellow .left-side{background:#222d32}.skin-yellow .sidebar a{color:#b8c7ce}.skin-yellow .sidebar a:hover{text-decoration:none}.skin-yellow .treeview-menu>li>a{color:#8aa4af}.skin-yellow .treeview-menu>li.active>a,.skin-yellow .treeview-menu>li>a:hover{color:#fff}.skin-yellow .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-yellow .sidebar-form input[type="text"],.skin-yellow .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-yellow .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-yellow .sidebar-form input[type="text"]:focus,.skin-yellow .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-yellow .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-yellow .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}.skin-purple .main-header .navbar{background-color:#605ca8}.skin-purple .main-header .navbar .nav>li>a{color:#fff}.skin-purple .main-header .navbar .nav>li>a:hover,.skin-purple .main-header .navbar .nav>li>a:active,.skin-purple .main-header .navbar .nav>li>a:focus,.skin-purple .main-header .navbar .nav .open>a,.skin-purple .main-header .navbar .nav .open>a:hover,.skin-purple .main-header .navbar .nav .open>a:focus{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-purple .main-header .navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-purple .main-header .navbar .dropdown-menu li a{color:#fff}.skin-purple .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple .main-header .logo{background-color:#555299;color:#fff;border-bottom:0 solid transparent}.skin-purple .main-header .logo>a{color:#fff}.skin-purple .main-header .logo:hover{background:#545096}.skin-purple .main-header li.user-header{background-color:#605ca8}.skin-purple .content-header{background:transparent}.skin-purple .user-panel>.info,.skin-purple .user-panel>.info>a{color:#fff}.skin-purple .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-purple .sidebar-menu>li>a{border-left:3px solid transparent;margin-right:1px}.skin-purple .sidebar-menu>li>a:hover,.skin-purple .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#605ca8}.skin-purple .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-purple .wrapper,.skin-purple .main-sidebar,.skin-purple .left-side{background:#222d32}.skin-purple .sidebar a{color:#b8c7ce}.skin-purple .sidebar a:hover{text-decoration:none}.skin-purple .treeview-menu>li>a{color:#8aa4af}.skin-purple .treeview-menu>li.active>a,.skin-purple .treeview-menu>li>a:hover{color:#fff}.skin-purple .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-purple .sidebar-form input[type="text"],.skin-purple .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-purple .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-purple .sidebar-form input[type="text"]:focus,.skin-purple .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}
\ No newline at end of file
diff --git a/dist/css/skins/skin-black.css b/dist/css/skins/skin-black.css
index cdb612df..9dab5295 100644
--- a/dist/css/skins/skin-black.css
+++ b/dist/css/skins/skin-black.css
@@ -4,16 +4,15 @@
*/
/* skin-black navbar */
.skin-black .main-header {
- -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0);
- box-shadow: 0px 1px 1px rgba(0, 0, 0, 0);
- border-bottom: 1px solid #ddd;
+ -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
+ box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
}
.skin-black .main-header .navbar-toggle {
color: #333;
}
.skin-black .main-header .navbar-brand {
color: #333;
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar {
background-color: #ffffff;
@@ -42,21 +41,21 @@
}
.skin-black .main-header > .navbar > .sidebar-toggle {
color: #333;
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar .navbar-nav > li > a {
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.skin-black .main-header > .navbar .navbar-custom-menu .navbar-nav > li > a,
.skin-black .main-header > .navbar .navbar-right > li > a {
- border-left: 1px solid #ddd;
+ border-left: 1px solid #eee;
border-right-width: 0;
}
.skin-black .main-header > .logo {
background-color: #ffffff;
color: #333333;
border-bottom: 0px solid transparent;
- border-right: 1px solid #ddd;
+ border-right: 1px solid #eee;
}
.skin-black .main-header > .logo > a {
color: #333333;
diff --git a/dist/css/skins/skin-black.min.css b/dist/css/skins/skin-black.min.css
index 8168d017..afb878f0 100644
--- a/dist/css/skins/skin-black.min.css
+++ b/dist/css/skins/skin-black.min.css
@@ -1 +1 @@
-.skin-black .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0);box-shadow:0 1px 1px rgba(0,0,0,0);border-bottom:1px solid #ddd}.skin-black .main-header .navbar-toggle{color:#333}.skin-black .main-header .navbar-brand{color:#333;border-right:1px solid #ddd}.skin-black .main-header>.navbar{background-color:#fff}.skin-black .main-header>.navbar .nav>li>a{color:#333}.skin-black .main-header>.navbar .nav>li>a:hover,.skin-black .main-header>.navbar .nav>li>a:active,.skin-black .main-header>.navbar .nav>li>a:focus,.skin-black .main-header>.navbar .nav .open>a,.skin-black .main-header>.navbar .nav .open>a:hover,.skin-black .main-header>.navbar .nav .open>a:focus{background:#fff;color:#999}.skin-black .main-header>.navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-black .main-header>.navbar .sidebar-toggle{color:#333}.skin-black .main-header>.navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black .main-header>.navbar>.sidebar-toggle{color:#333;border-right:1px solid #ddd}.skin-black .main-header>.navbar .navbar-nav>li>a{border-right:1px solid #ddd}.skin-black .main-header>.navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black .main-header>.navbar .navbar-right>li>a{border-left:1px solid #ddd;border-right-width:0}.skin-black .main-header>.logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #ddd}.skin-black .main-header>.logo>a{color:#333}.skin-black .main-header>.logo:hover{background:#fcfcfc}@media (max-width:767px){.skin-black .main-header>.logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black .main-header>.logo>a{color:#fff}.skin-black .main-header>.logo:hover{background:#1f1f1f}}.skin-black .main-header li.user-header{background-color:#222}.skin-black .content-header{background:transparent;box-shadow:none}.skin-black .user-panel>.image>img{border:1px solid #444}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#eee}.skin-black .main-sidebar,.skin-black .left-side,.skin-black .wrapper{background:#222}.skin-black .sidebar>.sidebar-menu>li.header{background:#1d1d1d;color:rgba(255,255,255,0.4)}.skin-black .sidebar>.sidebar-menu>li>a{margin-right:1px;border-left:3px solid transparent}.skin-black .sidebar>.sidebar-menu>li>a:hover,.skin-black .sidebar>.sidebar-menu>li.active>a{color:#fff;background:#444;border-left-color:#fff}.skin-black .sidebar>.sidebar-menu>li>.treeview-menu{background:#333}.skin-black .sidebar a{color:#eee}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#ccc}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border-radius:3px;border:1px solid #3c3c3c;margin:10px 10px}.skin-black .sidebar-form input[type="text"],.skin-black .sidebar-form .btn{box-shadow:none;background-color:#3c3c3c;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-black .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-black .sidebar-form input[type="text"]:focus,.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}
\ No newline at end of file
+.skin-black .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.skin-black .main-header .navbar-toggle{color:#333}.skin-black .main-header .navbar-brand{color:#333;border-right:1px solid #eee}.skin-black .main-header>.navbar{background-color:#fff}.skin-black .main-header>.navbar .nav>li>a{color:#333}.skin-black .main-header>.navbar .nav>li>a:hover,.skin-black .main-header>.navbar .nav>li>a:active,.skin-black .main-header>.navbar .nav>li>a:focus,.skin-black .main-header>.navbar .nav .open>a,.skin-black .main-header>.navbar .nav .open>a:hover,.skin-black .main-header>.navbar .nav .open>a:focus{background:#fff;color:#999}.skin-black .main-header>.navbar .navbar-custom-menu>.nav{margin-right:10px}.skin-black .main-header>.navbar .sidebar-toggle{color:#333}.skin-black .main-header>.navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black .main-header>.navbar>.sidebar-toggle{color:#333;border-right:1px solid #eee}.skin-black .main-header>.navbar .navbar-nav>li>a{border-right:1px solid #eee}.skin-black .main-header>.navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black .main-header>.navbar .navbar-right>li>a{border-left:1px solid #eee;border-right-width:0}.skin-black .main-header>.logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #eee}.skin-black .main-header>.logo>a{color:#333}.skin-black .main-header>.logo:hover{background:#fcfcfc}@media (max-width:767px){.skin-black .main-header>.logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black .main-header>.logo>a{color:#fff}.skin-black .main-header>.logo:hover{background:#1f1f1f}}.skin-black .main-header li.user-header{background-color:#222}.skin-black .content-header{background:transparent;box-shadow:none}.skin-black .user-panel>.image>img{border:1px solid #444}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#eee}.skin-black .main-sidebar,.skin-black .left-side,.skin-black .wrapper{background:#222}.skin-black .sidebar>.sidebar-menu>li.header{background:#1d1d1d;color:rgba(255,255,255,0.4)}.skin-black .sidebar>.sidebar-menu>li>a{margin-right:1px;border-left:3px solid transparent}.skin-black .sidebar>.sidebar-menu>li>a:hover,.skin-black .sidebar>.sidebar-menu>li.active>a{color:#fff;background:#444;border-left-color:#fff}.skin-black .sidebar>.sidebar-menu>li>.treeview-menu{background:#333}.skin-black .sidebar a{color:#eee}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#ccc}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border-radius:3px;border:1px solid #3c3c3c;margin:10px 10px}.skin-black .sidebar-form input[type="text"],.skin-black .sidebar-form .btn{box-shadow:none;background-color:#3c3c3c;border:1px solid transparent;height:35px;-webkit-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);-o-transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15);transition:all .3s cubic-bezier(.32, 1.25, .375, 1.15)}.skin-black .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px !important;border-top-right-radius:0 !important;border-bottom-right-radius:0 !important;border-bottom-left-radius:2px !important}.skin-black .sidebar-form input[type="text"]:focus,.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{color:#999;border-top-left-radius:0 !important;border-top-right-radius:2px !important;border-bottom-right-radius:2px !important;border-bottom-left-radius:0 !important}
\ No newline at end of file
diff --git a/dist/js/app.js b/dist/js/app.js
index 484321f7..241963ed 100755
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -27,7 +27,7 @@ if (typeof jQuery === "undefined") {
* prevents conflict with other plugins and is a better
* way to organize our code.
*/
-$.AdminLTE = new Object();
+$.AdminLTE = {};
/* --------------------
* - AdminLTE Options -
diff --git a/dist/js/app.min.js b/dist/js/app.min.js
index 1e8cbb51..b13b9cb4 100644
--- a/dist/js/app.min.js
+++ b/dist/js/app.min.js
@@ -10,4 +10,4 @@
* @version 2.0
* @license MIT
*/
-if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");$.AdminLTE=new Object,$.AdminLTE.options={navbarMenuSlimscroll:!0,navbarMenuSlimscrollWidth:"3px",navbarMenuHeight:"200px",sidebarToggleSelector:"[data-toggle='offcanvas']",sidebarPushMenu:!0,sidebarSlimScroll:!0,enableBoxRefresh:!0,enableBSToppltip:!0,BSTooltipSelector:"[data-toggle='tooltip']",enableFastclick:!0,enableBoxWidget:!0,boxWidgetOptions:{boxWidgetIcons:{collapse:"fa fa-minus",open:"fa fa-plus",remove:"fa fa-times"},boxWidgetSelectors:{remove:'[data-widget="remove"]',collapse:'[data-widget="collapse"]'}},colors:{lightBlue:"#3c8dbc",red:"#f56954",green:"#00a65a",aqua:"#00c0ef",yellow:"#f39c12",blue:"#0073b7",navy:"#001F3F",teal:"#39CCCC",olive:"#3D9970",lime:"#01FF70",orange:"#FF851B",fuchsia:"#F012BE",purple:"#8E24AA",maroon:"#D81B60",black:"#222222",gray:"#d2d6de"}},$(function(){var a=$.AdminLTE.options;$.AdminLTE.layout.activate(),$.AdminLTE.tree(".sidebar"),a.navbarMenuSlimscroll&&"undefined"!=typeof $.fn.slimscroll&&$(".navbar .menu").slimscroll({height:"200px",alwaysVisible:!1,size:"3px"}).css("width","100%"),a.sidebarPushMenu&&$.AdminLTE.pushMenu(a.sidebarToggleSelector),a.enableBSToppltip&&$(a.BSTooltipSelector).tooltip(),a.enableBoxWidget&&$.AdminLTE.boxWidget.activate(),a.enableFastclick&&"undefined"!=typeof FastClick&&FastClick.attach(document.body),$('.btn-group[data-toggle="btn-toggle"]').each(function(){var a=$(this);$(this).find(".btn").click(function(b){a.find(".btn.active").removeClass("active"),$(this).addClass("active"),b.preventDefault()})})}),$.AdminLTE.layout={activate:function(){var a=this;a.fix(),a.fixSidebar(),$(window,".wrapper").resize(function(){a.fix(),a.fixSidebar()})},fix:function(){var a=$(".main-header").outerHeight()+$(".main-footer").outerHeight(),b=$(window).height(),c=$(".sidebar").height();$("body").hasClass("fixed")?$(".content-wrapper, .right-side").css("min-height",b-$(".main-footer").outerHeight()):b>=c?$(".content-wrapper, .right-side").css("min-height",b-a):$(".content-wrapper, .right-side").css("min-height",c)},fixSidebar:function(){return $("body").hasClass("fixed")?("undefined"==typeof $.fn.slimScroll&&console&&console.error("Error: the fixed layout requires the slimscroll plugin!"),void($.AdminLTE.options.sidebarSlimScroll&&"undefined"!=typeof $.fn.slimScroll&&($(".sidebar").slimScroll({destroy:!0}).height("auto"),$(".sidebar").slimscroll({height:$(window).height()-$(".main-header").height()+"px",color:"rgba(0,0,0,0.2)",size:"3px"})))):void("undefined"!=typeof $.fn.slimScroll&&$(".sidebar").slimScroll({destroy:!0}).height("auto"))}},$.AdminLTE.pushMenu=function(a){$(a).click(function(a){a.preventDefault(),$("body").toggleClass("sidebar-collapse"),$("body").toggleClass("sidebar-open")}),$(".content-wrapper").click(function(){$(window).width()<=767&&$("body").hasClass("sidebar-open")&&$("body").removeClass("sidebar-open")})},$.AdminLTE.tree=function(a){$("li a",$(a)).click(function(a){var b=$(this),c=b.next();if(c.is(".treeview-menu")&&c.is(":visible"))c.slideUp("normal",function(){c.removeClass("menu-open")}),c.parent("li").removeClass("active");else if(c.is(".treeview-menu")&&!c.is(":visible")){var d=b.parents("ul").first(),e=d.find("ul:visible").slideUp("normal");e.removeClass("menu-open");var f=b.parent("li");c.slideDown("normal",function(){c.addClass("menu-open"),d.find("li.active").removeClass("active"),f.addClass("active")})}c.is(".treeview-menu")&&a.preventDefault()})},$.AdminLTE.boxWidget={activate:function(){var a=$.AdminLTE.options,b=this;$(a.boxWidgetOptions.boxWidgetSelectors.collapse).click(function(a){a.preventDefault(),b.collapse($(this))}),$(a.boxWidgetOptions.boxWidgetSelectors.remove).click(function(a){a.preventDefault(),b.remove($(this))})},collapse:function(a){var b=a.parents(".box").first(),c=b.find(".box-body, .box-footer");b.hasClass("collapsed-box")?(a.children(".fa-plus").removeClass("fa-plus").addClass("fa-minus"),c.slideDown(300,function(){b.removeClass("collapsed-box")})):(a.children(".fa-minus").removeClass("fa-minus").addClass("fa-plus"),c.slideUp(300,function(){b.addClass("collapsed-box")}))},remove:function(a){var b=a.parents(".box").first();b.slideUp()},options:$.AdminLTE.options.boxWidgetOptions},function(a){a.fn.boxRefresh=function(b){function c(a){a.append(f),e.onLoadStart.call(a)}function d(a){a.find(f).remove(),e.onLoadDone.call(a)}var e=a.extend({trigger:".refresh-btn",source:"",onLoadStart:function(){},onLoadDone:function(){}},b),f=a('');return this.each(function(){if(""===e.source)return void(console&&console.log("Please specify a source first - boxRefresh()"));var b=a(this),f=b.find(e.trigger).first();f.click(function(a){a.preventDefault(),c(b),b.find(".box-body").load(e.source,function(){d(b)})})})}}(jQuery),function(a){a.fn.todolist=function(b){var c=a.extend({onCheck:function(){},onUncheck:function(){}},b);return this.each(function(){"undefined"!=typeof a.fn.iCheck?(a("input",this).on("ifChecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)}),a("input",this).on("ifUnchecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onUncheck.call(b)})):a("input",this).on("change",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)})})}}(jQuery);
\ No newline at end of file
+if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");$.AdminLTE={},$.AdminLTE.options={navbarMenuSlimscroll:!0,navbarMenuSlimscrollWidth:"3px",navbarMenuHeight:"200px",sidebarToggleSelector:"[data-toggle='offcanvas']",sidebarPushMenu:!0,sidebarSlimScroll:!0,enableBoxRefresh:!0,enableBSToppltip:!0,BSTooltipSelector:"[data-toggle='tooltip']",enableFastclick:!0,enableBoxWidget:!0,boxWidgetOptions:{boxWidgetIcons:{collapse:"fa fa-minus",open:"fa fa-plus",remove:"fa fa-times"},boxWidgetSelectors:{remove:'[data-widget="remove"]',collapse:'[data-widget="collapse"]'}},colors:{lightBlue:"#3c8dbc",red:"#f56954",green:"#00a65a",aqua:"#00c0ef",yellow:"#f39c12",blue:"#0073b7",navy:"#001F3F",teal:"#39CCCC",olive:"#3D9970",lime:"#01FF70",orange:"#FF851B",fuchsia:"#F012BE",purple:"#8E24AA",maroon:"#D81B60",black:"#222222",gray:"#d2d6de"}},$(function(){var a=$.AdminLTE.options;$.AdminLTE.layout.activate(),$.AdminLTE.tree(".sidebar"),a.navbarMenuSlimscroll&&"undefined"!=typeof $.fn.slimscroll&&$(".navbar .menu").slimscroll({height:"200px",alwaysVisible:!1,size:"3px"}).css("width","100%"),a.sidebarPushMenu&&$.AdminLTE.pushMenu(a.sidebarToggleSelector),a.enableBSToppltip&&$(a.BSTooltipSelector).tooltip(),a.enableBoxWidget&&$.AdminLTE.boxWidget.activate(),a.enableFastclick&&"undefined"!=typeof FastClick&&FastClick.attach(document.body),$('.btn-group[data-toggle="btn-toggle"]').each(function(){var a=$(this);$(this).find(".btn").click(function(b){a.find(".btn.active").removeClass("active"),$(this).addClass("active"),b.preventDefault()})})}),$.AdminLTE.layout={activate:function(){var a=this;a.fix(),a.fixSidebar(),$(window,".wrapper").resize(function(){a.fix(),a.fixSidebar()})},fix:function(){var a=$(".main-header").outerHeight()+$(".main-footer").outerHeight(),b=$(window).height(),c=$(".sidebar").height();$("body").hasClass("fixed")?$(".content-wrapper, .right-side").css("min-height",b-$(".main-footer").outerHeight()):b>=c?$(".content-wrapper, .right-side").css("min-height",b-a):$(".content-wrapper, .right-side").css("min-height",c)},fixSidebar:function(){return $("body").hasClass("fixed")?("undefined"==typeof $.fn.slimScroll&&console&&console.error("Error: the fixed layout requires the slimscroll plugin!"),void($.AdminLTE.options.sidebarSlimScroll&&"undefined"!=typeof $.fn.slimScroll&&($(".sidebar").slimScroll({destroy:!0}).height("auto"),$(".sidebar").slimscroll({height:$(window).height()-$(".main-header").height()+"px",color:"rgba(0,0,0,0.2)",size:"3px"})))):void("undefined"!=typeof $.fn.slimScroll&&$(".sidebar").slimScroll({destroy:!0}).height("auto"))}},$.AdminLTE.pushMenu=function(a){$(a).click(function(a){a.preventDefault(),$("body").toggleClass("sidebar-collapse"),$("body").toggleClass("sidebar-open")}),$(".content-wrapper").click(function(){$(window).width()<=767&&$("body").hasClass("sidebar-open")&&$("body").removeClass("sidebar-open")})},$.AdminLTE.tree=function(a){$("li a",$(a)).click(function(a){var b=$(this),c=b.next();if(c.is(".treeview-menu")&&c.is(":visible"))c.slideUp("normal",function(){c.removeClass("menu-open")}),c.parent("li").removeClass("active");else if(c.is(".treeview-menu")&&!c.is(":visible")){var d=b.parents("ul").first(),e=d.find("ul:visible").slideUp("normal");e.removeClass("menu-open");var f=b.parent("li");c.slideDown("normal",function(){c.addClass("menu-open"),d.find("li.active").removeClass("active"),f.addClass("active")})}c.is(".treeview-menu")&&a.preventDefault()})},$.AdminLTE.boxWidget={activate:function(){var a=$.AdminLTE.options,b=this;$(a.boxWidgetOptions.boxWidgetSelectors.collapse).click(function(a){a.preventDefault(),b.collapse($(this))}),$(a.boxWidgetOptions.boxWidgetSelectors.remove).click(function(a){a.preventDefault(),b.remove($(this))})},collapse:function(a){var b=a.parents(".box").first(),c=b.find(".box-body, .box-footer");b.hasClass("collapsed-box")?(a.children(".fa-plus").removeClass("fa-plus").addClass("fa-minus"),c.slideDown(300,function(){b.removeClass("collapsed-box")})):(a.children(".fa-minus").removeClass("fa-minus").addClass("fa-plus"),c.slideUp(300,function(){b.addClass("collapsed-box")}))},remove:function(a){var b=a.parents(".box").first();b.slideUp()},options:$.AdminLTE.options.boxWidgetOptions},function(a){a.fn.boxRefresh=function(b){function c(a){a.append(f),e.onLoadStart.call(a)}function d(a){a.find(f).remove(),e.onLoadDone.call(a)}var e=a.extend({trigger:".refresh-btn",source:"",onLoadStart:function(){},onLoadDone:function(){}},b),f=a('');return this.each(function(){if(""===e.source)return void(console&&console.log("Please specify a source first - boxRefresh()"));var b=a(this),f=b.find(e.trigger).first();f.click(function(a){a.preventDefault(),c(b),b.find(".box-body").load(e.source,function(){d(b)})})})}}(jQuery),function(a){a.fn.todolist=function(b){var c=a.extend({onCheck:function(){},onUncheck:function(){}},b);return this.each(function(){"undefined"!=typeof a.fn.iCheck?(a("input",this).on("ifChecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)}),a("input",this).on("ifUnchecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onUncheck.call(b)})):a("input",this).on("change",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)})})}}(jQuery);
\ No newline at end of file
diff --git a/index2.html b/index2.html
index 7ebadcac..0b521352 100755
--- a/index2.html
+++ b/index2.html
@@ -915,7 +915,7 @@
@@ -1123,8 +1123,6 @@
-
-
diff --git a/pages/charts/chartjs.html b/pages/charts/chartjs.html
index e8083c1f..f6db91b2 100644
--- a/pages/charts/chartjs.html
+++ b/pages/charts/chartjs.html
@@ -613,7 +613,7 @@
//Boolean - whether to make the chart responsive
responsive: true,
maintainAspectRatio: false
- }
+ };
barChartOptions.datasetFill = false;
barChart.Bar(barChartData, barChartOptions);
diff --git a/pages/charts/inline.html b/pages/charts/inline.html
index 4e023b0f..8b215f94 100755
--- a/pages/charts/inline.html
+++ b/pages/charts/inline.html
@@ -732,7 +732,7 @@
-
+
@@ -937,7 +937,7 @@
}
lastmousetime = timenow;
setTimeout(mdraw, mrefreshinterval);
- }
+ };
// We could use setInterval instead, but I prefer to do it this way
setTimeout(mdraw, mrefreshinterval);
}
diff --git a/pages/mailbox/mailbox.html b/pages/mailbox/mailbox.html
index 979a149e..2e871d08 100644
--- a/pages/mailbox/mailbox.html
+++ b/pages/mailbox/mailbox.html
@@ -608,7 +608,7 @@
$(".mailbox-star").click(function (e) {
e.preventDefault();
//detect type
- var $this = $(this).find("a > i")
+ var $this = $(this).find("a > i");
var glyph = $this.hasClass("glyphicon");
var fa = $this.hasClass("fa");
diff --git a/plugins/ckeditor/plugins/wsc/dialogs/tmp.html b/plugins/ckeditor/plugins/wsc/dialogs/tmp.html
index 67642956..6e9b012e 100755
--- a/plugins/ckeditor/plugins/wsc/dialogs/tmp.html
+++ b/plugins/ckeditor/plugins/wsc/dialogs/tmp.html
@@ -44,8 +44,8 @@
window.addEventListener('message', handler, false);
} else {
window.attachEvent("onmessage", handler);
- };
- };
+ }
+ };
var _sendCmd = function(o) {
var str,
type = Object.prototype.toString,
@@ -57,9 +57,8 @@
if (type.call(o.message) == "[object Object]") {
(o.message['id']) ? o.message['id'] : o.message['id'] = id;
message = o.message;
- };
-
- str = JSON.stringify(message, fn);
+ }
+ str = JSON.stringify(message, fn);
target.postMessage(str, '*');
};
@@ -88,7 +87,7 @@
if (scriptTag.readyState == "loaded" ||
scriptTag.readyState == "complete") {
scriptTag.onreadystatechange = null;
- setTimeout(function(){scriptTag.parentNode.removeChild(scriptTag)},1)
+ setTimeout(function(){scriptTag.parentNode.removeChild(scriptTag)},1);
callback();
}
};
@@ -98,13 +97,11 @@
setTimeout(function(){scriptTag.parentNode.removeChild(scriptTag)},1);
callback();
};
- };
- scriptTag.src = src;
+ }
+ scriptTag.src = src;
document.getElementsByTagName("head")[0].appendChild(scriptTag);
- };
-
-
- window.onload = function(){
+ }
+ window.onload = function(){
loadScript(appString, function(){
manageMessageTmp.send({
'id': 'iframeOnload',
diff --git a/plugins/datatables/jquery.dataTables.js b/plugins/datatables/jquery.dataTables.js
index 1d8a220b..f1dd9fa5 100755
--- a/plugins/datatables/jquery.dataTables.js
+++ b/plugins/datatables/jquery.dataTables.js
@@ -4716,7 +4716,7 @@
{
throw new Error(sAlert);
}
- return;
+
}
else if ( window.console && console.log )
{
diff --git a/plugins/flot/excanvas.js b/plugins/flot/excanvas.js
index 70a8f25c..f45bf03d 100755
--- a/plugins/flot/excanvas.js
+++ b/plugins/flot/excanvas.js
@@ -1115,9 +1115,8 @@ if (!document.createElement('canvas').getContext) {
x: Z * (aX * m[0][0] + aY * m[1][0] + m[2][0]) - Z2,
y: Z * (aX * m[0][1] + aY * m[1][1] + m[2][1]) - Z2
};
- };
-
- contextPrototype.save = function() {
+ }
+ contextPrototype.save = function() {
var o = {};
copyState(this, o);
this.aStack_.push(o);
@@ -1366,7 +1365,7 @@ if (!document.createElement('canvas').getContext) {
case null:
case '':
this.repetition_ = 'repeat';
- break
+ break;
case 'repeat-x':
case 'repeat-y':
case 'no-repeat':
diff --git a/plugins/flot/jquery.colorhelpers.js b/plugins/flot/jquery.colorhelpers.js
index b2f6dc4e..cc1643b5 100755
--- a/plugins/flot/jquery.colorhelpers.js
+++ b/plugins/flot/jquery.colorhelpers.js
@@ -68,7 +68,7 @@
};
return o.normalize();
- }
+ };
// extract CSS color property from element, going up in the DOM
// if it's "transparent"
@@ -89,7 +89,7 @@
c = "transparent";
return $.color.parse(c);
- }
+ };
// parse CSS color string (like "rgb(10, 32, 43)" or "#fff"),
// returns color object, if parsing failed, you get black (0, 0,
@@ -130,7 +130,7 @@
res = lookupColors[name] || [0, 0, 0];
return m(res[0], res[1], res[2]);
}
- }
+ };
var lookupColors = {
aqua:[0,255,255],
diff --git a/plugins/flot/jquery.flot.image.js b/plugins/flot/jquery.flot.image.js
index d2837cf7..2e00ab18 100755
--- a/plugins/flot/jquery.flot.image.js
+++ b/plugins/flot/jquery.flot.image.js
@@ -94,7 +94,7 @@ Google Maps).
callback();
});
- }
+ };
$.plot.image.load = function (urls, callback) {
var missing = urls.length, loaded = {};
diff --git a/plugins/flot/jquery.flot.pie.js b/plugins/flot/jquery.flot.pie.js
index 99158630..bf190e18 100755
--- a/plugins/flot/jquery.flot.pie.js
+++ b/plugins/flot/jquery.flot.pie.js
@@ -318,7 +318,7 @@ More detail and specific examples can be found in the included HTML file.
if (options.series.pie.tilt <= 0.8) {
drawShadow();
}
- } while (!drawPie() && attempts < REDRAW_ATTEMPTS)
+ } while (!drawPie() && attempts < REDRAW_ATTEMPTS);
if (attempts >= REDRAW_ATTEMPTS) {
clear();
diff --git a/plugins/flot/jquery.flot.time.js b/plugins/flot/jquery.flot.time.js
index 15f52815..ac9e666a 100755
--- a/plugins/flot/jquery.flot.time.js
+++ b/plugins/flot/jquery.flot.time.js
@@ -114,9 +114,8 @@ API.txt for details.
sourceObj[sourceMethod] = function() {
return targetObj[targetMethod].apply(targetObj, arguments);
};
- };
-
- var utc = {
+ }
+ var utc = {
date: d
};
@@ -137,9 +136,8 @@ API.txt for details.
}
return utc;
- };
-
- // select time zone strategy. This returns a date-like object tied to the
+ }
+ // select time zone strategy. This returns a date-like object tied to the
// desired timezone
function dateGenerator(ts, opts) {
diff --git a/plugins/fullcalendar/fullcalendar.js b/plugins/fullcalendar/fullcalendar.js
index ced9527e..d52e8241 100755
--- a/plugins/fullcalendar/fullcalendar.js
+++ b/plugins/fullcalendar/fullcalendar.js
@@ -13,9 +13,7 @@
}
})(function($, moment) {
-;;
-
-var defaults = {
+ var defaults = {
titleRangeSeparator: ' \u2014 ', // emphasized dash
monthYearFormat: 'MMMM YYYY', // required for en. other languages rely on datepicker computable option
@@ -126,9 +124,7 @@ var rtlDefaults = {
}
};
-;;
-
-var fc = $.fullCalendar = { version: "2.2.5" };
+ var fc = $.fullCalendar = { version: "2.2.5" };
var fcViews = fc.views = {};
@@ -206,9 +202,7 @@ function isForcedAtomicOption(name) {
// FIX: find a different solution for view-option-hashes and have a whitelist
// for options that can be recursively merged.
-;;
-
-var langOptionHash = fc.langs = {}; // initialize and expose
+ var langOptionHash = fc.langs = {}; // initialize and expose
// TODO: document the structure and ordering of a FullCalendar lang file
@@ -357,8 +351,6 @@ function getMomentLocaleData(langCode) {
// Also, sets it as the default.
fc.lang('en', englishDefaults);
-;;
-
// exports
fc.intersectionToSeg = intersectionToSeg;
fc.applyAll = applyAll;
@@ -839,9 +831,7 @@ function debounce(func, wait) {
};
}
-;;
-
-var ambigDateOfMonthRegex = /^\s*\d{4}-\d\d$/;
+ var ambigDateOfMonthRegex = /^\s*\d{4}-\d\d$/;
var ambigTimeOrZoneRegex =
/^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?)?$/;
var newMomentProto = moment.fn; // where we will attach our new methods
@@ -1286,8 +1276,6 @@ setLocalValues = allowValueOptimization ? function(mom, a) {
moment.updateOffset(mom, false); // keepTime=false
} : setMomentValues;
-;;
-
// Single Date Formatting
// -------------------------------------------------------------------------------------------------
@@ -1516,9 +1504,7 @@ function chunkFormatString(formatStr) {
return chunks;
}
-;;
-
-fc.Class = Class; // export
+ fc.Class = Class; // export
// class that all other classes will inherit from
function Class() { }
@@ -1557,9 +1543,7 @@ Class.extend = function(members) {
Class.mixin = function(members) {
copyOwnProps(members.prototype || members, this.prototype);
};
-;;
-
-/* A rectangular panel that is absolutely positioned over other content
+ /* A rectangular panel that is absolutely positioned over other content
------------------------------------------------------------------------------------------------------------------------
Options:
- className (string)
@@ -1726,9 +1710,7 @@ var Popover = Class.extend({
});
-;;
-
-/* A "coordinate map" converts pixel coordinates into an associated cell, which has an associated date
+ /* A "coordinate map" converts pixel coordinates into an associated cell, which has an associated date
------------------------------------------------------------------------------------------------------------------------
Common interface:
@@ -1888,9 +1870,7 @@ var ComboCoordMap = Class.extend({
});
-;;
-
-/* Tracks mouse movements over a CoordMap and raises events about which cell the mouse is over.
+ /* Tracks mouse movements over a CoordMap and raises events about which cell the mouse is over.
----------------------------------------------------------------------------------------------------------------------*/
// TODO: very useful to have a handler that gets called upon cellOut OR when dragging stops (for cleanup)
@@ -2313,9 +2293,7 @@ function isCellsEqual(cell1, cell2) {
return false;
}
-;;
-
-/* Creates a clone of an element and lets it track the mouse as it moves
+ /* Creates a clone of an element and lets it track the mouse as it moves
----------------------------------------------------------------------------------------------------------------------*/
var MouseFollower = Class.extend({
@@ -2500,9 +2478,7 @@ var MouseFollower = Class.extend({
});
-;;
-
-/* A utility class for rendering rows.
+ /* A utility class for rendering
rows.
----------------------------------------------------------------------------------------------------------------------*/
// It leverages methods of the subclass and the View to determine custom rendering behavior for each row "type"
// (such as highlight rows, day rows, helper rows, etc).
@@ -2604,9 +2580,7 @@ var RowRenderer = Class.extend({
});
-;;
-
-/* An abstract class comprised of a "grid" of cells that each represent a specific datetime
+ /* An abstract class comprised of a "grid" of cells that each represent a specific datetime
----------------------------------------------------------------------------------------------------------------------*/
var Grid = fc.Grid = RowRenderer.extend({
@@ -3184,9 +3158,7 @@ var Grid = fc.Grid = RowRenderer.extend({
});
-;;
-
-/* Event-rendering and event-interaction methods for the abstract Grid class
+ /* Event-rendering and event-interaction methods for the abstract Grid class
----------------------------------------------------------------------------------------------------------------------*/
Grid.mixin({
@@ -4085,9 +4057,7 @@ function getDraggedElMeta(el) {
}
-;;
-
-/* A component that renders a grid of whole-days that runs horizontally. There can be multiple rows, one per week.
+ /* A component that renders a grid of whole-days that runs horizontally. There can be multiple rows, one per week.
----------------------------------------------------------------------------------------------------------------------*/
var DayGrid = Grid.extend({
@@ -4554,9 +4524,7 @@ var DayGrid = Grid.extend({
});
-;;
-
-/* Event-rendering methods for the DayGrid class
+ /* Event-rendering methods for the DayGrid class
----------------------------------------------------------------------------------------------------------------------*/
DayGrid.mixin({
@@ -4859,9 +4827,7 @@ function compareDaySegCols(a, b) {
return a.leftCol - b.leftCol;
}
-;;
-
-/* Methods relate to limiting the number events for a given day on a DayGrid
+ /* Methods relate to limiting the number events for a given day on a DayGrid
----------------------------------------------------------------------------------------------------------------------*/
// NOTE: all the segs being passed around in here are foreground segs
@@ -5214,9 +5180,7 @@ DayGrid.mixin({
});
-;;
-
-/* A component that renders one or more columns of vertical time slots
+ /* A component that renders one or more columns of vertical time slots
----------------------------------------------------------------------------------------------------------------------*/
var TimeGrid = Grid.extend({
@@ -5724,9 +5688,7 @@ var TimeGrid = Grid.extend({
});
-;;
-
-/* Event-rendering methods for the TimeGrid class
+ /* Event-rendering methods for the TimeGrid class
----------------------------------------------------------------------------------------------------------------------*/
TimeGrid.mixin({
@@ -6132,9 +6094,7 @@ function compareForwardSlotSegs(seg1, seg2) {
compareSegs(seg1, seg2);
}
-;;
-
-/* An abstract class from which other views inherit from
+ /* An abstract class from which other views inherit from
----------------------------------------------------------------------------------------------------------------------*/
var View = fc.View = Class.extend({
@@ -6862,10 +6822,7 @@ var View = fc.View = Class.extend({
});
-;;
-
-
-function Calendar(element, instanceOptions) {
+ function Calendar(element, instanceOptions) {
var t = this;
@@ -7668,9 +7625,7 @@ function Calendar(element, instanceOptions) {
}
-;;
-
-/* Top toolbar area with buttons and title
+ /* Top toolbar area with buttons and title
----------------------------------------------------------------------------------------------------------------------*/
// TODO: rename all header-related things to "toolbar"
@@ -7896,9 +7851,7 @@ function Header(calendar, options) {
}
-;;
-
-fc.sourceNormalizers = [];
+ fc.sourceNormalizers = [];
fc.sourceFetchers = [];
var ajaxDefaults = {
@@ -8983,9 +8936,7 @@ function backupEventDates(event) {
event._end = event.end ? event.end.clone() : null;
}
-;;
-
-/* An abstract class for the "basic" views, as well as month view. Renders one or more rows of day cells.
+ /* An abstract class for the "basic" views, as well as month view. Renders one or more rows of day cells.
----------------------------------------------------------------------------------------------------------------------*/
// It is a manager for a DayGrid subcomponent, which does most of the heavy lifting.
// It is responsible for managing width/height.
@@ -9296,9 +9247,7 @@ var BasicView = fcViews.basic = View.extend({
});
-;;
-
-/* A month view with day cells running in rows (one-per-week) and columns
+ /* A month view with day cells running in rows (one-per-week) and columns
----------------------------------------------------------------------------------------------------------------------*/
setDefaults({
@@ -9350,27 +9299,21 @@ var MonthView = fcViews.month = BasicView.extend({
MonthView.duration = { months: 1 };
-;;
-
-/* A week view with simple day cells running horizontally
+ /* A week view with simple day cells running horizontally
----------------------------------------------------------------------------------------------------------------------*/
fcViews.basicWeek = {
type: 'basic',
duration: { weeks: 1 }
};
-;;
-
-/* A view with a single simple day cell
+ /* A view with a single simple day cell
----------------------------------------------------------------------------------------------------------------------*/
fcViews.basicDay = {
type: 'basic',
duration: { days: 1 }
};
-;;
-
-/* An abstract class for all agenda-related views. Displays one more columns with time slots running vertically.
+ /* An abstract class for all agenda-related views. Displays one more columns with time slots running vertically.
----------------------------------------------------------------------------------------------------------------------*/
// Is a manager for the TimeGrid subcomponent and possibly the DayGrid subcomponent (if allDaySlot is on).
// Responsible for managing width/height.
@@ -9772,24 +9715,18 @@ fcViews.agenda = View.extend({ // AgendaView
});
-;;
-
-/* A week view with an all-day cell area at the top, and a time grid below
+ /* A week view with an all-day cell area at the top, and a time grid below
----------------------------------------------------------------------------------------------------------------------*/
fcViews.agendaWeek = {
type: 'agenda',
duration: { weeks: 1 }
};
-;;
-
-/* A day view with an all-day cell area at the top, and a time grid below
+ /* A day view with an all-day cell area at the top, and a time grid below
----------------------------------------------------------------------------------------------------------------------*/
fcViews.agendaDay = {
type: 'agenda',
duration: { days: 1 }
};
-;;
-
});
\ No newline at end of file
diff --git a/plugins/iCheck/icheck.js b/plugins/iCheck/icheck.js
index af111e19..4da1937a 100755
--- a/plugins/iCheck/icheck.js
+++ b/plugins/iCheck/icheck.js
@@ -44,7 +44,7 @@
stack = stack.add(self);
} else {
stack = stack.add(self.find(handle));
- };
+ }
});
};
@@ -64,12 +64,11 @@
tidy(self, 'ifDestroyed');
} else {
operate(self, true, options);
- };
-
- // Fire method's callback
+ }
+ // Fire method's callback
if ($.isFunction(fire)) {
fire();
- };
+ }
});
// Customization
@@ -97,14 +96,12 @@
// Selector limit
if (selector == _checkbox || selector == _radio) {
handle = 'input[type="' + selector + '"]';
- };
-
- // Clickable area limit
+ }
+ // Clickable area limit
if (area < -50) {
area = -50;
- };
-
- // Walk around the selector
+ }
+ // Walk around the selector
walker(this);
return stack.each(function() {
@@ -172,9 +169,8 @@
parent += '"';
});
- };
-
- // Wrap input
+ }
+ // Wrap input
parent = self.wrap(parent + '/>')[_callback]('ifCreated').parent().append(settings.insert);
// Layer addition
@@ -213,19 +209,17 @@
} else {
parent[_add](hoverClass);
item[_add](labelHoverClass);
- };
- };
-
- if (_mobile) {
+ }
+ }
+ if (_mobile) {
event.stopPropagation();
} else {
return false;
- };
- };
+ }
+ }
});
- };
-
- // Input events
+ }
+ // Input events
self.on(_click + '.i focus.i blur.i keyup.i keydown.i keypress.i', function(event) {
var type = event[_type],
key = event.keyCode;
@@ -241,10 +235,9 @@
off(self, _checked);
} else {
on(self, _checked);
- };
- };
-
- return false;
+ }
+ }
+ return false;
// Keyup
} else if (type == 'keyup' && node[_type] == _radio) {
@@ -253,7 +246,7 @@
// Focus/blur
} else if (/us|ur/.test(type)) {
parent[type == 'blur' ? _remove : _add](focusClass);
- };
+ }
});
// Helper events
@@ -282,27 +275,25 @@
// State is off
} else {
parent[_remove](toggle + ' ' + activeClass);
- };
-
- // Label hover
+ }
+ // Label hover
if (label.length && labelHover && toggle == hoverClass) {
// mouseout|touchend
label[/ut|nd/.test(type) ? _remove : _add](labelHoverClass);
- };
- };
-
- if (_mobile) {
+ }
+ }
+ if (_mobile) {
event.stopPropagation();
} else {
return false;
- };
- };
+ }
+ }
});
});
} else {
return this;
- };
+ }
};
// Do something with inputs
@@ -332,28 +323,25 @@
on(input, state, true);
} else {
off(input, state, true);
- };
- };
-
+ }
+ }
} else if (!direct || method == 'toggle') {
// Helper or label was clicked
if (!direct) {
input[_callback]('ifClicked');
- };
-
- // Toggle checked state
+ }
+ // Toggle checked state
if (active) {
if (node[_type] !== _radio) {
off(input, state);
- };
+ }
} else {
on(input, state);
- };
- };
- };
-
- // Add checked, disabled or indeterminate state
+ }
+ }
+ }
+ // Add checked, disabled or indeterminate state
function on(input, state, keep) {
var node = input[0],
parent = input.parent(),
@@ -377,11 +365,10 @@
inputs.each(function() {
if (this !== node && $(this).data(_iCheck)) {
off($(this), state);
- };
+ }
});
- };
-
- // Indeterminate state
+ }
+ // Indeterminate state
if (indeterminate) {
// Add indeterminate state
@@ -390,32 +377,27 @@
// Remove checked state
if (node[_checked]) {
off(input, _checked, 'force');
- };
-
- // Checked or disabled state
+ }
+ // Checked or disabled state
} else {
// Add checked or disabled state
if (!keep) {
node[state] = true;
- };
-
- // Remove indeterminate state
+ }
+ // Remove indeterminate state
if (checked && node[_indeterminate]) {
off(input, _indeterminate, false);
- };
- };
-
- // Trigger callbacks
+ }
+ }
+ // Trigger callbacks
callbacks(input, checked, state, keep);
- };
-
- // Add proper cursor
+ }
+ // Add proper cursor
if (node[_disabled] && !!option(input, _cursor, true)) {
parent.find('.' + _iCheckHelper).css(_cursor, 'default');
- };
-
- // Add state class
+ }
+ // Add state class
parent[_add](specific || option(input, state) || '');
// Set ARIA attribute
@@ -423,9 +405,8 @@
// Remove regular state class
parent[_remove](regular || option(input, callback) || '');
- };
-
- // Remove checked, disabled or indeterminate state
+ }
+ // Remove checked, disabled or indeterminate state
function off(input, state, keep) {
var node = input[0],
parent = input.parent(),
@@ -442,18 +423,15 @@
// Toggle state
if (indeterminate || !keep || keep == 'force') {
node[state] = false;
- };
-
- // Trigger callbacks
+ }
+ // Trigger callbacks
callbacks(input, checked, callback, keep);
- };
-
- // Add proper cursor
+ }
+ // Add proper cursor
if (!node[_disabled] && !!option(input, _cursor, true)) {
parent.find('.' + _iCheckHelper).css(_cursor, 'pointer');
- };
-
- // Remove state class
+ }
+ // Remove state class
parent[_remove](specific || option(input, state) || '');
// Set ARIA attribute
@@ -461,9 +439,8 @@
// Add regular state class
parent[_add](regular || option(input, callback) || '');
- };
-
- // Remove all traces
+ }
+ // Remove all traces
function tidy(input, callback) {
if (input.data(_iCheck)) {
@@ -473,34 +450,29 @@
// Callback
if (callback) {
input[_callback](callback);
- };
-
- // Unbind events
+ }
+ // Unbind events
input.off('.i').unwrap();
$(_label + '[for="' + input[0].id + '"]').add(input.closest(_label)).off('.i');
- };
- };
-
- // Get some option
+ }
+ }
+ // Get some option
function option(input, state, regular) {
if (input.data(_iCheck)) {
return input.data(_iCheck).o[state + (regular ? '' : 'Class')];
- };
- };
-
- // Capitalize some string
+ }
+ }
+ // Capitalize some string
function capitalize(string) {
return string.charAt(0).toUpperCase() + string.slice(1);
- };
-
- // Executable handlers
+ }
+ // Executable handlers
function callbacks(input, checked, callback, keep) {
if (!keep) {
if (checked) {
input[_callback]('ifToggled');
- };
-
- input[_callback]('ifChanged')[_callback]('if' + capitalize(callback));
- };
- };
+ }
+ input[_callback]('ifChanged')[_callback]('if' + capitalize(callback));
+ }
+ }
})(window.jQuery || window.Zepto);
diff --git a/plugins/input-mask/jquery.inputmask.js b/plugins/input-mask/jquery.inputmask.js
index cfbbfaa6..86cb3205 100755
--- a/plugins/input-mask/jquery.inputmask.js
+++ b/plugins/input-mask/jquery.inputmask.js
@@ -464,7 +464,6 @@
while (--position > 0 && !isMask(position)) {
}
- ;
return position;
}
@@ -854,9 +853,6 @@
return end - (lengthBefore - buffer.length); //return new start position
}
- ;
-
-
function HandleRemove(input, k, pos) {
if (opts.numericInput || isRTL) {
switch (k) {
@@ -1419,8 +1415,7 @@
return getActiveBuffer().join('');
}
}
- };
-
+ }
$.inputmask = {
//options default
defaults: {
diff --git a/plugins/input-mask/jquery.inputmask.regex.extensions.js b/plugins/input-mask/jquery.inputmask.regex.extensions.js
index c5bc30f3..e956569b 100755
--- a/plugins/input-mask/jquery.inputmask.regex.extensions.js
+++ b/plugins/input-mask/jquery.inputmask.regex.extensions.js
@@ -89,8 +89,7 @@ Allows for using regular expressions as a mask
if (currentToken.matches.length > 0)
opts.regexTokens.push(currentToken);
- };
-
+ }
function validateRegexToken(token, fromGroup) {
var isvalid = false;
if (fromGroup) {
diff --git a/plugins/jQueryUI/jquery-ui-1.10.3.js b/plugins/jQueryUI/jquery-ui-1.10.3.js
index 2ea9134e..c9a0affb 100755
--- a/plugins/jQueryUI/jquery-ui-1.10.3.js
+++ b/plugins/jQueryUI/jquery-ui-1.10.3.js
@@ -2923,7 +2923,7 @@ $.widget("ui.resizable", $.ui.mouse, {
//TODO: What's that good for? There's not anything to be executed left
if(!$(this.handles[i]).length) {
- continue;
+
}
}
};