From 9829c86f7ca5c76ef21892ec1198858eebc99392 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 26 Nov 2013 15:21:27 -0800 Subject: run grunt --- dist/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 91fa987a5..0d5c3e0c7 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -721,7 +721,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (!isActive) { 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 $('
').insertAfter($(this)).on('click', clearMenus) } -- cgit v1.2.3 From 3d5e598e5c9bc4d0573266e9a0aa84f988683285 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Thu, 28 Nov 2013 18:40:15 +0100 Subject: add builded files from dist/ --- dist/js/bootstrap.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 0d5c3e0c7..cc1b839d2 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,13 +1,13 @@ -/*! - * Bootstrap v3.0.2 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 v3.0.2 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.2 * http://getbootstrap.com/javascript/#transitions @@ -64,7 +64,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: alert.js v3.0.2 * http://getbootstrap.com/javascript/#alerts @@ -163,7 +163,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) }(jQuery); - + /* ======================================================================== * Bootstrap: button.js v3.0.2 * http://getbootstrap.com/javascript/#buttons @@ -279,7 +279,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: carousel.js v3.0.2 * http://getbootstrap.com/javascript/#carousel @@ -497,7 +497,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: collapse.js v3.0.2 * http://getbootstrap.com/javascript/#collapse @@ -677,7 +677,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: dropdown.js v3.0.2 * http://getbootstrap.com/javascript/#dropdowns @@ -832,7 +832,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(jQuery); - + /* ======================================================================== * Bootstrap: modal.js v3.0.2 * http://getbootstrap.com/javascript/#modals @@ -1079,7 +1079,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) }(jQuery); - + /* ======================================================================== * Bootstrap: tooltip.js v3.0.2 * http://getbootstrap.com/javascript/#tooltip @@ -1466,7 +1466,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } }(jQuery); - + /* ======================================================================== * Bootstrap: popover.js v3.0.2 * http://getbootstrap.com/javascript/#popovers @@ -1584,7 +1584,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } }(jQuery); - + /* ======================================================================== * Bootstrap: scrollspy.js v3.0.2 * http://getbootstrap.com/javascript/#scrollspy @@ -1743,7 +1743,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: tab.js v3.0.2 * http://getbootstrap.com/javascript/#tabs @@ -1879,7 +1879,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: affix.js v3.0.2 * http://getbootstrap.com/javascript/#affix -- cgit v1.2.3 From 594d0c700dacbce8805bab1be6111631c8e003fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 11:33:00 -0800 Subject: grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing --- dist/js/bootstrap.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index cc1b839d2..0d5c3e0c7 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,13 +1,13 @@ -/*! - * Bootstrap v3.0.2 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 v3.0.2 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.2 * http://getbootstrap.com/javascript/#transitions @@ -64,7 +64,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: alert.js v3.0.2 * http://getbootstrap.com/javascript/#alerts @@ -163,7 +163,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) }(jQuery); - + /* ======================================================================== * Bootstrap: button.js v3.0.2 * http://getbootstrap.com/javascript/#buttons @@ -279,7 +279,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: carousel.js v3.0.2 * http://getbootstrap.com/javascript/#carousel @@ -497,7 +497,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: collapse.js v3.0.2 * http://getbootstrap.com/javascript/#collapse @@ -677,7 +677,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: dropdown.js v3.0.2 * http://getbootstrap.com/javascript/#dropdowns @@ -832,7 +832,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(jQuery); - + /* ======================================================================== * Bootstrap: modal.js v3.0.2 * http://getbootstrap.com/javascript/#modals @@ -1079,7 +1079,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) }(jQuery); - + /* ======================================================================== * Bootstrap: tooltip.js v3.0.2 * http://getbootstrap.com/javascript/#tooltip @@ -1466,7 +1466,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } }(jQuery); - + /* ======================================================================== * Bootstrap: popover.js v3.0.2 * http://getbootstrap.com/javascript/#popovers @@ -1584,7 +1584,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } }(jQuery); - + /* ======================================================================== * Bootstrap: scrollspy.js v3.0.2 * http://getbootstrap.com/javascript/#scrollspy @@ -1743,7 +1743,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: tab.js v3.0.2 * http://getbootstrap.com/javascript/#tabs @@ -1879,7 +1879,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: affix.js v3.0.2 * http://getbootstrap.com/javascript/#affix -- cgit v1.2.3 From a7a9dcaeb2231b2580cf79fcee7d777b98ac24d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 00:42:36 -0800 Subject: Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it --- dist/js/bootstrap.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index b7313f403..e04cd1f8d 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,9 +1,7 @@ /*! - * Bootstrap v3.0.2 by @fat and @mdo + * Bootstrap v3.0.2 (http://getbootstrap.com) * 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") } -- cgit v1.2.3