Skip to content

Commit

Permalink
Upstream update to Bootstrap 3.0.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
jerivas committed Oct 31, 2013
1 parent d3e1f99 commit 4977bed
Show file tree
Hide file tree
Showing 9 changed files with 1,521 additions and 1,117 deletions.
524 changes: 335 additions & 189 deletions mezzanine/core/static/css/bootstrap-theme.css

Large diffs are not rendered by default.

1,646 changes: 950 additions & 696 deletions mezzanine/core/static/css/bootstrap.css

Large diffs are not rendered by default.

Binary file modified mezzanine/core/static/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
399 changes: 200 additions & 199 deletions mezzanine/core/static/fonts/glyphicons-halflings-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mezzanine/core/static/fonts/glyphicons-halflings-regular.ttf
Binary file not shown.
Binary file modified mezzanine/core/static/fonts/glyphicons-halflings-regular.woff
Binary file not shown.
59 changes: 31 additions & 28 deletions mezzanine/core/static/js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
/**
* bootstrap.js v3.0.0 by @fat and @mdo
* Copyright 2013 Twitter Inc.
* http://www.apache.org/licenses/LICENSE-2.0
*/
if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
/*!
* Bootstrap v3.0.1 by @fat and @mdo
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/

if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: transition.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#transitions
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
Expand Down Expand Up @@ -64,7 +67,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: alert.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#alerts
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
Expand Down Expand Up @@ -163,7 +166,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: button.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#buttons
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
Expand Down Expand Up @@ -273,9 +276,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: carousel.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#carousel
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -491,9 +494,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: collapse.js v3.0.0
* 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");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -671,9 +674,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: dropdown.js v3.0.0
* 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");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -826,9 +829,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: modal.js v3.0.0
* 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");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1073,10 +1076,10 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: tooltip.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#tooltip
* http://getbootstrap.com/javascript/#tooltip
* 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");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1460,9 +1463,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: popover.js v3.0.0
* 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");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1578,9 +1581,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: scrollspy.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1737,9 +1740,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: tab.js v3.0.0
* 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");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1767,7 +1770,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
Tab.prototype.show = function () {
var $this = this.element
var $ul = $this.closest('ul:not(.dropdown-menu)')
var selector = $this.attr('data-target')
var selector = $this.data('target')

if (!selector) {
selector = $this.attr('href')
Expand Down Expand Up @@ -1873,9 +1876,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
* Bootstrap: affix.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#affix
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions mezzanine/core/static/js/html5shiv.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions mezzanine/core/static/js/respond.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4977bed

Please sign in to comment.