diff options
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | docs/assets/js/src/customizer.js | 2 | ||||
-rw-r--r-- | grunt/npm-shrinkwrap.json | 2 | ||||
-rw-r--r-- | js/affix.js | 4 | ||||
-rw-r--r-- | js/alert.js | 4 | ||||
-rw-r--r-- | js/button.js | 4 | ||||
-rw-r--r-- | js/carousel.js | 4 | ||||
-rw-r--r-- | js/collapse.js | 4 | ||||
-rw-r--r-- | js/dropdown.js | 4 | ||||
-rw-r--r-- | js/modal.js | 4 | ||||
-rw-r--r-- | js/popover.js | 4 | ||||
-rw-r--r-- | js/scrollspy.js | 4 | ||||
-rw-r--r-- | js/tab.js | 4 | ||||
-rw-r--r-- | js/tooltip.js | 4 | ||||
-rw-r--r-- | js/transition.js | 2 | ||||
-rw-r--r-- | less/bootstrap.less | 2 | ||||
-rw-r--r-- | less/theme.less | 2 | ||||
-rw-r--r-- | nuget/bootstrap.less.nuspec | 2 | ||||
-rw-r--r-- | nuget/bootstrap.nuspec | 2 | ||||
-rw-r--r-- | package.js | 2 | ||||
-rw-r--r-- | package.json | 2 |
21 files changed, 32 insertions, 32 deletions
@@ -29,7 +29,7 @@ To get started, check out <http://getbootstrap.com>! Several quick start options are available: -* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.7.zip). +* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.4.0.zip). * Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. * Install with [Bower](http://bower.io): `bower install bootstrap`. * Install with [npm](https://www.npmjs.com): `npm install bootstrap@3`. diff --git a/docs/assets/js/src/customizer.js b/docs/assets/js/src/customizer.js index 84d3e6832d..00de361676 100644 --- a/docs/assets/js/src/customizer.js +++ b/docs/assets/js/src/customizer.js @@ -12,7 +12,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 'use strict'; var cw = '/*!\n' + - ' * Bootstrap v3.3.7 (http://getbootstrap.com)\n' + + ' * Bootstrap v3.4.0 (http://getbootstrap.com)\n' + ' * Copyright 2011-' + new Date().getFullYear() + ' Twitter, Inc.\n' + ' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' + ' */\n\n' diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json index cc57def0fe..67e10b5379 100644 --- a/grunt/npm-shrinkwrap.json +++ b/grunt/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "bootstrap", - "version": "3.3.7", + "version": "3.4.0", "dependencies": { "abbrev": { "version": "1.0.9", diff --git a/js/affix.js b/js/affix.js index 7f6516818a..b86bc4f340 100644 --- a/js/affix.js +++ b/js/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.3.7 + * Bootstrap: affix.js v3.4.0 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -28,7 +28,7 @@ this.checkPosition() } - Affix.VERSION = '3.3.7' + Affix.VERSION = '3.4.0' Affix.RESET = 'affix affix-top affix-bottom' diff --git a/js/alert.js b/js/alert.js index db97f3b02b..058d82527c 100644 --- a/js/alert.js +++ b/js/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.3.7 + * Bootstrap: alert.js v3.4.0 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -18,7 +18,7 @@ $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.3.7' + Alert.VERSION = '3.4.0' Alert.TRANSITION_DURATION = 150 diff --git a/js/button.js b/js/button.js index 843b39c9d2..e18b8aeaed 100644 --- a/js/button.js +++ b/js/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.3.7 + * Bootstrap: button.js v3.4.0 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -19,7 +19,7 @@ this.isLoading = false } - Button.VERSION = '3.3.7' + Button.VERSION = '3.4.0' Button.DEFAULTS = { loadingText: 'loading...' diff --git a/js/carousel.js b/js/carousel.js index 6ff954c9bd..3f642f35bf 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.3.7 + * Bootstrap: carousel.js v3.4.0 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -30,7 +30,7 @@ .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } - Carousel.VERSION = '3.3.7' + Carousel.VERSION = '3.4.0' Carousel.TRANSITION_DURATION = 600 diff --git a/js/collapse.js b/js/collapse.js index 12038693d9..08862a50c4 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.3.7 + * Bootstrap: collapse.js v3.4.0 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -30,7 +30,7 @@ if (this.options.toggle) this.toggle() } - Collapse.VERSION = '3.3.7' + Collapse.VERSION = '3.4.0' Collapse.TRANSITION_DURATION = 350 diff --git a/js/dropdown.js b/js/dropdown.js index 04e9c2de47..75fa55ea86 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.3.7 + * Bootstrap: dropdown.js v3.4.0 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -19,7 +19,7 @@ $(element).on('click.bs.dropdown', this.toggle) } - Dropdown.VERSION = '3.3.7' + Dropdown.VERSION = '3.4.0' function getParent($this) { var selector = $this.attr('data-target') diff --git a/js/modal.js b/js/modal.js index f84142d81f..f0ef87b94a 100644 --- a/js/modal.js +++ b/js/modal.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: modal.js v3.3.7 + * Bootstrap: modal.js v3.4.0 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -33,7 +33,7 @@ } } - Modal.VERSION = '3.3.7' + Modal.VERSION = '3.4.0' Modal.TRANSITION_DURATION = 300 Modal.BACKDROP_TRANSITION_DURATION = 150 diff --git a/js/popover.js b/js/popover.js index efe19567a1..a61f2b8d11 100644 --- a/js/popover.js +++ b/js/popover.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: popover.js v3.3.7 + * Bootstrap: popover.js v3.4.0 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -19,7 +19,7 @@ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - Popover.VERSION = '3.3.7' + Popover.VERSION = '3.4.0' Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { placement: 'right', diff --git a/js/scrollspy.js b/js/scrollspy.js index fe1980951b..fd3e9aff1a 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.3.7 + * Bootstrap: scrollspy.js v3.4.0 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -28,7 +28,7 @@ this.process() } - ScrollSpy.VERSION = '3.3.7' + ScrollSpy.VERSION = '3.4.0' ScrollSpy.DEFAULTS = { offset: 10 @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tab.js v3.3.7 + * Bootstrap: tab.js v3.4.0 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2011-2016 Twitter, Inc. @@ -19,7 +19,7 @@ // jscs:enable requireDollarBeforejQueryAssignment } - Tab.VERSION = '3.3.7' + Tab.VERSION = '3.4.0' Tab.TRANSITION_DURATION = 150 diff --git a/js/tooltip.js b/js/tooltip.js index e35d9c7ccc..968a97871a 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.3.7 + * Bootstrap: tooltip.js v3.4.0 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -26,7 +26,7 @@ this.init('tooltip', element, options) } - Tooltip.VERSION = '3.3.7' + Tooltip.VERSION = '3.4.0' Tooltip.TRANSITION_DURATION = 150 diff --git a/js/transition.js b/js/transition.js index db76596e84..1801320591 100644 --- a/js/transition.js +++ b/js/transition.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: transition.js v3.3.7 + * Bootstrap: transition.js v3.4.0 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2011-2016 Twitter, Inc. diff --git a/less/bootstrap.less b/less/bootstrap.less index f0aa08f3a6..88f7802deb 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.3.7 (http://getbootstrap.com) + * Bootstrap v3.4.0 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/less/theme.less b/less/theme.less index fb6174427b..905fa0e07e 100644 --- a/less/theme.less +++ b/less/theme.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.3.7 (http://getbootstrap.com) + * Bootstrap v3.4.0 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/nuget/bootstrap.less.nuspec b/nuget/bootstrap.less.nuspec index c72d9ee75f..20bc8d5457 100644 --- a/nuget/bootstrap.less.nuspec +++ b/nuget/bootstrap.less.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>bootstrap.less</id> - <version>3.3.7</version> + <version>3.4.0</version> <title>Bootstrap Less</title> <authors>Twitter, Inc.</authors> <owners>bootstrap</owners> diff --git a/nuget/bootstrap.nuspec b/nuget/bootstrap.nuspec index aa0db01ac5..f62029d7fe 100644 --- a/nuget/bootstrap.nuspec +++ b/nuget/bootstrap.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>bootstrap</id> - <version>3.3.7</version> + <version>3.4.0</version> <title>Bootstrap CSS</title> <authors>Twitter, Inc.</authors> <owners>bootstrap</owners> diff --git a/package.js b/package.js index f1ddd0c21e..bfaa4bc1f2 100644 --- a/package.js +++ b/package.js @@ -6,7 +6,7 @@ Package.describe({ name: 'twbs:bootstrap', // http://atmospherejs.com/twbs/bootstrap summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.', - version: '3.3.7', + version: '3.4.0', git: 'https://github.com/twbs/bootstrap.git' }); diff --git a/package.json b/package.json index fe4b31dea3..1d674de6af 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "3.3.7", + "version": "3.4.0", "keywords": [ "css", "less", |