From 7fcfe61f4da41356b2ae974ad20536db0d74e83f Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 7 Jan 2014 01:05:24 +0100 Subject: Update copyright notices in all places - Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo - grunt dist to update all the files --- dist/js/bootstrap.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 4b5bbf0f0..7cb3f299e 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,6 +1,6 @@ /*! * Bootstrap v3.0.3 (http://getbootstrap.com) - * Copyright 2014 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -10,7 +10,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: transition.js v3.0.3 * http://getbootstrap.com/javascript/#transitions * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -58,7 +58,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: alert.js v3.0.3 * http://getbootstrap.com/javascript/#alerts * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -146,7 +146,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: button.js v3.0.3 * http://getbootstrap.com/javascript/#buttons * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -253,7 +253,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: carousel.js v3.0.3 * http://getbootstrap.com/javascript/#carousel * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -458,7 +458,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: collapse.js v3.0.3 * http://getbootstrap.com/javascript/#collapse * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -627,7 +627,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: dropdown.js v3.0.3 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -774,7 +774,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: modal.js v3.0.3 * http://getbootstrap.com/javascript/#modals * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1018,7 +1018,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1226,7 +1226,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" // $.fn.offset doesn't round pixel values // so we use setOffset directly with our own function B-0 - jQuery.offset.setOffset($tip[0], $.extend({ + $.offset.setOffset($tip[0], $.extend({ using: function (props) { $tip.css({ top: Math.round(props.top), @@ -1416,7 +1416,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: popover.js v3.0.3 * http://getbootstrap.com/javascript/#popovers * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1526,7 +1526,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: scrollspy.js v3.0.3 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1679,7 +1679,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: tab.js v3.0.3 * http://getbootstrap.com/javascript/#tabs * ======================================================================== - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1804,7 +1804,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: affix.js v3.0.3 * http://getbootstrap.com/javascript/#affix * ======================================================================== - * Copyright 2014 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ -- cgit v1.2.3 From 8fd177bfa78d3e742486a66450465f3716cd11b2 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 7 Jan 2014 22:24:45 +0100 Subject: Fix #12073: Consistent order of variations This changes the order of component variations throughout the repo (code and docs) to be more consistent. The order now used everywhere is the one most frequently found in the repo before: Default, Primary, Success, Info, Warning, Danger --- dist/js/bootstrap.js | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 7cb3f299e..88e9645ff 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -15,7 +15,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) // ============================================================ @@ -63,7 +64,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // ALERT CLASS DEFINITION // ====================== @@ -151,7 +153,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // BUTTON PUBLIC CLASS DEFINITION // ============================== @@ -258,7 +261,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // CAROUSEL CLASS DEFINITION // ========================= @@ -463,7 +467,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // COLLAPSE PUBLIC CLASS DEFINITION // ================================ @@ -632,7 +637,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // DROPDOWN CLASS DEFINITION // ========================= @@ -779,7 +785,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // MODAL CLASS DEFINITION // ====================== @@ -1023,7 +1030,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // TOOLTIP PUBLIC CLASS DEFINITION // =============================== @@ -1421,7 +1429,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // POPOVER PUBLIC CLASS DEFINITION // =============================== @@ -1531,7 +1540,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // SCROLLSPY CLASS DEFINITION // ========================== @@ -1684,7 +1694,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // TAB CLASS DEFINITION // ==================== @@ -1809,7 +1820,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { + 'use strict'; // AFFIX CLASS DEFINITION // ====================== -- cgit v1.2.3