Moved to bootstrap 3.0.3.
This commit is contained in:
parent
eea8d684fc
commit
973e162ff5
9 changed files with 502 additions and 437 deletions
|
@ -1,6 +1,6 @@
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: button.js v3.0.0
|
* Bootstrap: button.js v3.0.3
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#buttons
|
* http://getbootstrap.com/javascript/#buttons
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2013 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
|
@ -54,15 +54,21 @@
|
||||||
|
|
||||||
Button.prototype.toggle = function () {
|
Button.prototype.toggle = function () {
|
||||||
var $parent = this.$element.closest('[data-toggle="buttons"]')
|
var $parent = this.$element.closest('[data-toggle="buttons"]')
|
||||||
|
var changed = true
|
||||||
|
|
||||||
if ($parent.length) {
|
if ($parent.length) {
|
||||||
var $input = this.$element.find('input')
|
var $input = this.$element.find('input')
|
||||||
.prop('checked', !this.$element.hasClass('active'))
|
if ($input.prop('type') === 'radio') {
|
||||||
.trigger('change')
|
// see if clicking on current one
|
||||||
if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
|
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')
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$element.toggleClass('active')
|
if (changed) this.$element.toggleClass('active')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -106,4 +112,4 @@
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(jQuery);
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: collapse.js v3.0.0
|
* Bootstrap: collapse.js v3.0.3
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#collapse
|
* http://getbootstrap.com/javascript/#collapse
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -176,4 +176,4 @@
|
||||||
$target.collapse(option)
|
$target.collapse(option)
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(jQuery);
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: dropdown.js v3.0.0
|
* Bootstrap: dropdown.js v3.0.3
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
|
* http://getbootstrap.com/javascript/#dropdowns
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
var backdrop = '.dropdown-backdrop'
|
var backdrop = '.dropdown-backdrop'
|
||||||
var toggle = '[data-toggle=dropdown]'
|
var toggle = '[data-toggle=dropdown]'
|
||||||
var Dropdown = function (element) {
|
var Dropdown = function (element) {
|
||||||
var $el = $(element).on('click.bs.dropdown', this.toggle)
|
$(element).on('click.bs.dropdown', this.toggle)
|
||||||
}
|
}
|
||||||
|
|
||||||
Dropdown.prototype.toggle = function (e) {
|
Dropdown.prototype.toggle = function (e) {
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
if (!isActive) {
|
if (!isActive) {
|
||||||
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
|
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
|
||||||
// if mobile we we use a backdrop because click events don't delegate
|
// if mobile we use a backdrop because click events don't delegate
|
||||||
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
|
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,9 +123,9 @@
|
||||||
$.fn.dropdown = function (option) {
|
$.fn.dropdown = function (option) {
|
||||||
return this.each(function () {
|
return this.each(function () {
|
||||||
var $this = $(this)
|
var $this = $(this)
|
||||||
var data = $this.data('dropdown')
|
var data = $this.data('bs.dropdown')
|
||||||
|
|
||||||
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
|
if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
|
||||||
if (typeof option == 'string') data[option].call($this)
|
if (typeof option == 'string') data[option].call($this)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -151,4 +151,4 @@
|
||||||
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
||||||
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
||||||
|
|
||||||
}(window.jQuery);
|
}(jQuery);
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: modal.js v3.0.0
|
* Bootstrap: modal.js v3.0.3
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#modals
|
* http://getbootstrap.com/javascript/#modals
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -243,4 +243,4 @@
|
||||||
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
|
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
|
||||||
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
|
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
|
||||||
|
|
||||||
}(window.jQuery);
|
}(jQuery);
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: popover.js v3.0.0
|
* Bootstrap: popover.js v3.0.3
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#popovers
|
* http://getbootstrap.com/javascript/#popovers
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -114,4 +114,4 @@
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
}(window.jQuery);
|
}(jQuery);
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: tab.js v3.0.0
|
* Bootstrap: tab.js v3.0.3
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#tabs
|
* http://getbootstrap.com/javascript/#tabs
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -30,7 +30,7 @@
|
||||||
Tab.prototype.show = function () {
|
Tab.prototype.show = function () {
|
||||||
var $this = this.element
|
var $this = this.element
|
||||||
var $ul = $this.closest('ul:not(.dropdown-menu)')
|
var $ul = $this.closest('ul:not(.dropdown-menu)')
|
||||||
var selector = $this.attr('data-target')
|
var selector = $this.data('target')
|
||||||
|
|
||||||
if (!selector) {
|
if (!selector) {
|
||||||
selector = $this.attr('href')
|
selector = $this.attr('href')
|
||||||
|
@ -132,4 +132,4 @@
|
||||||
$(this).tab('show')
|
$(this).tab('show')
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(jQuery);
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: tooltip.js v3.0.0
|
* Bootstrap: tooltip.js v3.0.3
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#tooltip
|
* http://getbootstrap.com/javascript/#tooltip
|
||||||
* Inspired by the original jQuery.tipsy by Jason Frame
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -383,4 +383,4 @@
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
}(window.jQuery);
|
}(jQuery);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* ========================================================================
|
/* ========================================================================
|
||||||
* Bootstrap: transition.js v3.0.0
|
* Bootstrap: transition.js v3.0.3
|
||||||
* http://twbs.github.com/bootstrap/javascript.html#transitions
|
* http://getbootstrap.com/javascript/#transitions
|
||||||
* ========================================================================
|
* ========================================================================
|
||||||
* Copyright 2013 Twitter, Inc.
|
* Copyright 2013 Twitter, Inc.
|
||||||
*
|
*
|
||||||
|
@ -53,4 +53,4 @@
|
||||||
$.support.transition = transitionEnd()
|
$.support.transition = transitionEnd()
|
||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);
|
}(jQuery);
|
||||||
|
|
855
app/assets/stylesheets/bootstrap.css
vendored
855
app/assets/stylesheets/bootstrap.css
vendored
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue