Skip to content

Commit 3b68402

Browse files
committed
Bootstrap Upgrade
Signed-off-by: David Thorpe <[email protected]>
1 parent c205644 commit 3b68402

8 files changed

+1608
-1288
lines changed

public/css/bootstrap.css

100755100644
Lines changed: 1323 additions & 1010 deletions
Large diffs are not rendered by default.

public/css/bootstrap.min.css

100755100644
Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/fonts/glyphicons-halflings-regular.eot

100755100644
6.07 KB
Binary file not shown.

public/fonts/glyphicons-halflings-regular.svg

100755100644
Lines changed: 200 additions & 199 deletions
Loading

public/fonts/glyphicons-halflings-regular.ttf

100755100644
11.4 KB
Binary file not shown.

public/fonts/glyphicons-halflings-regular.woff

100755100644
6.68 KB
Binary file not shown.

public/js/bootstrap.js

100755100644
Lines changed: 72 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
/**
2-
* bootstrap.js v3.0.0 by @fat and @mdo
3-
* Copyright 2013 Twitter Inc.
4-
* http://www.apache.org/licenses/LICENSE-2.0
5-
*/
6-
if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
1+
/*!
2+
* Bootstrap v3.0.3 (http://getbootstrap.com)
3+
* Copyright 2013 Twitter, Inc.
4+
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
5+
*/
6+
7+
if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
78

89
/* ========================================================================
9-
* Bootstrap: transition.js v3.0.0
10-
* http://twbs.github.com/bootstrap/javascript.html#transitions
10+
* Bootstrap: transition.js v3.0.3
11+
* http://getbootstrap.com/javascript/#transitions
1112
* ========================================================================
1213
* Copyright 2013 Twitter, Inc.
1314
*
@@ -60,11 +61,11 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
6061
$.support.transition = transitionEnd()
6162
})
6263

63-
}(window.jQuery);
64+
}(jQuery);
6465

6566
/* ========================================================================
66-
* Bootstrap: alert.js v3.0.0
67-
* http://twbs.github.com/bootstrap/javascript.html#alerts
67+
* Bootstrap: alert.js v3.0.3
68+
* http://getbootstrap.com/javascript/#alerts
6869
* ========================================================================
6970
* Copyright 2013 Twitter, Inc.
7071
*
@@ -159,11 +160,11 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
159160

160161
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
161162

162-
}(window.jQuery);
163+
}(jQuery);
163164

164165
/* ========================================================================
165-
* Bootstrap: button.js v3.0.0
166-
* http://twbs.github.com/bootstrap/javascript.html#buttons
166+
* Bootstrap: button.js v3.0.3
167+
* http://getbootstrap.com/javascript/#buttons
167168
* ========================================================================
168169
* Copyright 2013 Twitter, Inc.
169170
*
@@ -217,15 +218,21 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
217218

218219
Button.prototype.toggle = function () {
219220
var $parent = this.$element.closest('[data-toggle="buttons"]')
221+
var changed = true
220222

221223
if ($parent.length) {
222224
var $input = this.$element.find('input')
223-
.prop('checked', !this.$element.hasClass('active'))
224-
.trigger('change')
225-
if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
225+
if ($input.prop('type') === 'radio') {
226+
// see if clicking on current one
227+
if ($input.prop('checked') && this.$element.hasClass('active'))
228+
changed = false
229+
else
230+
$parent.find('.active').removeClass('active')
231+
}
232+
if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
226233
}
227234

228-
this.$element.toggleClass('active')
235+
if (changed) this.$element.toggleClass('active')
229236
}
230237

231238

@@ -269,13 +276,13 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
269276
e.preventDefault()
270277
})
271278

272-
}(window.jQuery);
279+
}(jQuery);
273280

274281
/* ========================================================================
275-
* Bootstrap: carousel.js v3.0.0
276-
* http://twbs.github.com/bootstrap/javascript.html#carousel
282+
* Bootstrap: carousel.js v3.0.3
283+
* http://getbootstrap.com/javascript/#carousel
277284
* ========================================================================
278-
* Copyright 2012 Twitter, Inc.
285+
* Copyright 2013 Twitter, Inc.
279286
*
280287
* Licensed under the Apache License, Version 2.0 (the "License");
281288
* you may not use this file except in compliance with the License.
@@ -342,7 +349,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
342349

343350
if (pos > (this.$items.length - 1) || pos < 0) return
344351

345-
if (this.sliding) return this.$element.one('slid', function () { that.to(pos) })
352+
if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
346353
if (activeIndex == pos) return this.pause().cycle()
347354

348355
return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@@ -394,7 +401,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
394401

395402
if (this.$indicators.length) {
396403
this.$indicators.find('.active').removeClass('active')
397-
this.$element.one('slid', function () {
404+
this.$element.one('slid.bs.carousel', function () {
398405
var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
399406
$nextIndicator && $nextIndicator.addClass('active')
400407
})
@@ -412,7 +419,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
412419
$next.removeClass([type, direction].join(' ')).addClass('active')
413420
$active.removeClass(['active', direction].join(' '))
414421
that.sliding = false
415-
setTimeout(function () { that.$element.trigger('slid') }, 0)
422+
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
416423
})
417424
.emulateTransitionEnd(600)
418425
} else {
@@ -421,7 +428,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
421428
$active.removeClass('active')
422429
$next.addClass('active')
423430
this.sliding = false
424-
this.$element.trigger('slid')
431+
this.$element.trigger('slid.bs.carousel')
425432
}
426433

427434
isCycling && this.cycle()
@@ -487,13 +494,13 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
487494
})
488495
})
489496

490-
}(window.jQuery);
497+
}(jQuery);
491498

492499
/* ========================================================================
493-
* Bootstrap: collapse.js v3.0.0
494-
* http://twbs.github.com/bootstrap/javascript.html#collapse
500+
* Bootstrap: collapse.js v3.0.3
501+
* http://getbootstrap.com/javascript/#collapse
495502
* ========================================================================
496-
* Copyright 2012 Twitter, Inc.
503+
* Copyright 2013 Twitter, Inc.
497504
*
498505
* Licensed under the Apache License, Version 2.0 (the "License");
499506
* you may not use this file except in compliance with the License.
@@ -667,13 +674,13 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
667674
$target.collapse(option)
668675
})
669676

670-
}(window.jQuery);
677+
}(jQuery);
671678

672679
/* ========================================================================
673-
* Bootstrap: dropdown.js v3.0.0
674-
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
680+
* Bootstrap: dropdown.js v3.0.3
681+
* http://getbootstrap.com/javascript/#dropdowns
675682
* ========================================================================
676-
* Copyright 2012 Twitter, Inc.
683+
* Copyright 2013 Twitter, Inc.
677684
*
678685
* Licensed under the Apache License, Version 2.0 (the "License");
679686
* you may not use this file except in compliance with the License.
@@ -697,7 +704,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
697704
var backdrop = '.dropdown-backdrop'
698705
var toggle = '[data-toggle=dropdown]'
699706
var Dropdown = function (element) {
700-
var $el = $(element).on('click.bs.dropdown', this.toggle)
707+
$(element).on('click.bs.dropdown', this.toggle)
701708
}
702709

703710
Dropdown.prototype.toggle = function (e) {
@@ -712,7 +719,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
712719

713720
if (!isActive) {
714721
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
715-
// if mobile we we use a backdrop because click events don't delegate
722+
// if mobile we use a backdrop because click events don't delegate
716723
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
717724
}
718725

@@ -794,9 +801,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
794801
$.fn.dropdown = function (option) {
795802
return this.each(function () {
796803
var $this = $(this)
797-
var data = $this.data('dropdown')
804+
var data = $this.data('bs.dropdown')
798805

799-
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
806+
if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
800807
if (typeof option == 'string') data[option].call($this)
801808
})
802809
}
@@ -822,13 +829,13 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
822829
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
823830
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
824831

825-
}(window.jQuery);
832+
}(jQuery);
826833

827834
/* ========================================================================
828-
* Bootstrap: modal.js v3.0.0
829-
* http://twbs.github.com/bootstrap/javascript.html#modals
835+
* Bootstrap: modal.js v3.0.3
836+
* http://getbootstrap.com/javascript/#modals
830837
* ========================================================================
831-
* Copyright 2012 Twitter, Inc.
838+
* Copyright 2013 Twitter, Inc.
832839
*
833840
* Licensed under the Apache License, Version 2.0 (the "License");
834841
* you may not use this file except in compliance with the License.
@@ -1069,14 +1076,14 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
10691076
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
10701077
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
10711078

1072-
}(window.jQuery);
1079+
}(jQuery);
10731080

10741081
/* ========================================================================
1075-
* Bootstrap: tooltip.js v3.0.0
1076-
* http://twbs.github.com/bootstrap/javascript.html#tooltip
1082+
* Bootstrap: tooltip.js v3.0.3
1083+
* http://getbootstrap.com/javascript/#tooltip
10771084
* Inspired by the original jQuery.tipsy by Jason Frame
10781085
* ========================================================================
1079-
* Copyright 2012 Twitter, Inc.
1086+
* Copyright 2013 Twitter, Inc.
10801087
*
10811088
* Licensed under the Apache License, Version 2.0 (the "License");
10821089
* you may not use this file except in compliance with the License.
@@ -1456,13 +1463,13 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
14561463
return this
14571464
}
14581465

1459-
}(window.jQuery);
1466+
}(jQuery);
14601467

14611468
/* ========================================================================
1462-
* Bootstrap: popover.js v3.0.0
1463-
* http://twbs.github.com/bootstrap/javascript.html#popovers
1469+
* Bootstrap: popover.js v3.0.3
1470+
* http://getbootstrap.com/javascript/#popovers
14641471
* ========================================================================
1465-
* Copyright 2012 Twitter, Inc.
1472+
* Copyright 2013 Twitter, Inc.
14661473
*
14671474
* Licensed under the Apache License, Version 2.0 (the "License");
14681475
* you may not use this file except in compliance with the License.
@@ -1574,13 +1581,13 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
15741581
return this
15751582
}
15761583

1577-
}(window.jQuery);
1584+
}(jQuery);
15781585

15791586
/* ========================================================================
1580-
* Bootstrap: scrollspy.js v3.0.0
1581-
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
1587+
* Bootstrap: scrollspy.js v3.0.3
1588+
* http://getbootstrap.com/javascript/#scrollspy
15821589
* ========================================================================
1583-
* Copyright 2012 Twitter, Inc.
1590+
* Copyright 2013 Twitter, Inc.
15841591
*
15851592
* Licensed under the Apache License, Version 2.0 (the "License");
15861593
* you may not use this file except in compliance with the License.
@@ -1691,7 +1698,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
16911698
.addClass('active')
16921699
}
16931700

1694-
active.trigger('activate')
1701+
active.trigger('activate.bs.scrollspy')
16951702
}
16961703

16971704

@@ -1733,13 +1740,13 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
17331740
})
17341741
})
17351742

1736-
}(window.jQuery);
1743+
}(jQuery);
17371744

17381745
/* ========================================================================
1739-
* Bootstrap: tab.js v3.0.0
1740-
* http://twbs.github.com/bootstrap/javascript.html#tabs
1746+
* Bootstrap: tab.js v3.0.3
1747+
* http://getbootstrap.com/javascript/#tabs
17411748
* ========================================================================
1742-
* Copyright 2012 Twitter, Inc.
1749+
* Copyright 2013 Twitter, Inc.
17431750
*
17441751
* Licensed under the Apache License, Version 2.0 (the "License");
17451752
* you may not use this file except in compliance with the License.
@@ -1767,7 +1774,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
17671774
Tab.prototype.show = function () {
17681775
var $this = this.element
17691776
var $ul = $this.closest('ul:not(.dropdown-menu)')
1770-
var selector = $this.attr('data-target')
1777+
var selector = $this.data('target')
17711778

17721779
if (!selector) {
17731780
selector = $this.attr('href')
@@ -1869,13 +1876,13 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
18691876
$(this).tab('show')
18701877
})
18711878

1872-
}(window.jQuery);
1879+
}(jQuery);
18731880

18741881
/* ========================================================================
1875-
* Bootstrap: affix.js v3.0.0
1876-
* http://twbs.github.com/bootstrap/javascript.html#affix
1882+
* Bootstrap: affix.js v3.0.3
1883+
* http://getbootstrap.com/javascript/#affix
18771884
* ========================================================================
1878-
* Copyright 2012 Twitter, Inc.
1885+
* Copyright 2013 Twitter, Inc.
18791886
*
18801887
* Licensed under the Apache License, Version 2.0 (the "License");
18811888
* you may not use this file except in compliance with the License.
@@ -1996,4 +2003,4 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
19962003
})
19972004
})
19982005

1999-
}(window.jQuery);
2006+
}(jQuery);

public/js/bootstrap.min.js

100755100644
Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)