From: Mark Otto Date: Fri, 26 Jul 2013 05:53:57 +0000 (-0700) Subject: Update URLs to account for v3 rc1 soft launch X-Git-Tag: v2.3.2^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d59745955f0070c3a1536ac8b725f67adf493bf;p=thirdparty%2Fbootstrap.git Update URLs to account for v3 rc1 soft launch --- diff --git a/Makefile b/Makefile index 1ad0ba567b..9f51166176 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ build: @echo "Compiling documentation... ${CHECK} Done" @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js @./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js - @echo "/**\n* Bootstrap.js v2.3.2 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js + @echo "/**\n* Bootstrap.js v2.3.2 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js @echo "Compiling and minifying javascript... ${CHECK} Done" @@ -74,7 +74,7 @@ bootstrap/js/*.js: js/*.js mkdir -p bootstrap/js cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js ./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js - echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js + echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js index 46cb2fcb88..f305c2ec3d 100644 --- a/js/bootstrap-affix.js +++ b/js/bootstrap-affix.js @@ -1,8 +1,8 @@ /* ========================================================== * bootstrap-affix.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#affix + * http://getbootstrap.com/2.3.3/javascript.html#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. diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 4f560def4d..020d2a7965 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -1,8 +1,8 @@ /* ========================================================== * bootstrap-alert.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#alerts + * http://getbootstrap.com/2.3.3/javascript.html#alerts * ========================================================== - * 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. diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index f8b52eb419..668948d698 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,8 +1,8 @@ /* ============================================================ * bootstrap-button.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#buttons + * http://getbootstrap.com/2.3.3/javascript.html#buttons * ============================================================ - * 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. diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 300b86ed22..6882d6d426 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,8 +1,8 @@ /* ========================================================== * bootstrap-carousel.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#carousel + * http://getbootstrap.com/2.3.3/javascript.html#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. diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 1b68044417..0ee53053d7 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,8 +1,8 @@ /* ============================================================= * bootstrap-collapse.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#collapse + * http://getbootstrap.com/2.3.3/javascript.html#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. diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index f5e3e31f24..a77698dc2f 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,8 +1,8 @@ /* ============================================================ * bootstrap-dropdown.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * http://getbootstrap.com/2.3.3/javascript.html#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. diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 1ad9a1640e..db3f2785ac 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,8 +1,8 @@ /* ========================================================= * bootstrap-modal.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#modals + * http://getbootstrap.com/2.3.3/javascript.html#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. diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 7d0e277474..078cd8221f 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,8 +1,8 @@ /* =========================================================== * bootstrap-popover.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#popovers + * http://getbootstrap.com/2.3.3/javascript.html#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. diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index aae25aca94..de2bc8b374 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -1,8 +1,8 @@ /* ============================================================= * bootstrap-scrollspy.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#scrollspy + * http://getbootstrap.com/2.3.3/javascript.html#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. diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index bb3fc439ef..7dc43130a7 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,8 +1,8 @@ /* ======================================================== * bootstrap-tab.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#tabs + * http://getbootstrap.com/2.3.3/javascript.html#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. diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index dbbf7d27f8..f0af4d3145 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,9 +1,9 @@ /* =========================================================== * bootstrap-tooltip.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#tooltips + * http://getbootstrap.com/2.3.3/javascript.html#tooltips * 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. diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index bf89aac8c3..cb3c7f1463 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,8 +1,8 @@ /* =================================================== * bootstrap-transition.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#transitions + * http://getbootstrap.com/2.3.3/javascript.html#transitions * =================================================== - * 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. diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index d45e6ed57e..3f1a20d9bc 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,8 +1,8 @@ /* ============================================================= * bootstrap-typeahead.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#typeahead + * http://getbootstrap.com/2.3.3/javascript.html#typeahead * ============================================================= - * 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. diff --git a/less/bootstrap.less b/less/bootstrap.less index d4ebf37acc..3eabae1440 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,11 +1,11 @@ /*! * Bootstrap v2.3.2 * - * Copyright 2012 Twitter, Inc + * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * - * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Designed and built with all the love in the world by @mdo and @fat. */ // Core variables and mixins