Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <code@rebertia.com>2015-03-16 18:39:31 +0300
committerChris Rebert <code@rebertia.com>2015-03-16 18:39:31 +0300
commit4d652035dcf8fd42783dc466605e4c5d045e11fc (patch)
tree4de6a77d9cf3a8b4ed715679555e2f61c2d37edd
parent66ceae7b753137376ee00cd5a68004b7831c6eb9 (diff)
v3.3.2 => v3.3.4
-rw-r--r--README.md2
-rw-r--r--_config.yml6
-rw-r--r--bower.json2
-rw-r--r--docs/assets/js/src/customizer.js2
-rw-r--r--js/affix.js4
-rw-r--r--js/alert.js4
-rw-r--r--js/button.js4
-rw-r--r--js/carousel.js4
-rw-r--r--js/collapse.js4
-rw-r--r--js/dropdown.js4
-rw-r--r--js/modal.js4
-rw-r--r--js/popover.js4
-rw-r--r--js/scrollspy.js4
-rw-r--r--js/tab.js4
-rw-r--r--js/tooltip.js4
-rw-r--r--js/transition.js2
-rw-r--r--package.js2
-rw-r--r--package.json2
-rw-r--r--test-infra/npm-shrinkwrap.json2
19 files changed, 32 insertions, 32 deletions
diff --git a/README.md b/README.md
index 41336fc294..06e17f0fa9 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!
Five quick start options are available:
-- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.2.zip).
+- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.4.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`.
diff --git a/_config.yml b/_config.yml
index 5199c01364..08146dda2d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -14,13 +14,13 @@ url: http://getbootstrap.com
encoding: UTF-8
# Custom vars
-current_version: 3.3.2
+current_version: 3.3.4
repo: https://github.com/twbs/bootstrap
sass_repo: https://github.com/twbs/bootstrap-sass
download:
- source: https://github.com/twbs/bootstrap/archive/v3.3.2.zip
- dist: https://github.com/twbs/bootstrap/releases/download/v3.3.2/bootstrap-3.3.2-dist.zip
+ source: https://github.com/twbs/bootstrap/archive/v3.3.4.zip
+ dist: https://github.com/twbs/bootstrap/releases/download/v3.3.4/bootstrap-3.3.4-dist.zip
sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.3.tar.gz
blog: http://blog.getbootstrap.com
diff --git a/bower.json b/bower.json
index f1e36af87e..d7eea39223 100644
--- a/bower.json
+++ b/bower.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.2",
+ "version": "3.3.4",
"keywords": [
"css",
"js",
diff --git a/docs/assets/js/src/customizer.js b/docs/assets/js/src/customizer.js
index 12a35a9b91..d38a71724c 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.2 (http://getbootstrap.com)\n' +
+ ' * Bootstrap v3.3.4 (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/js/affix.js b/js/affix.js
index fe780e44e5..98197642aa 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: affix.js v3.3.2
+ * Bootstrap: affix.js v3.3.4
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -28,7 +28,7 @@
this.checkPosition()
}
- Affix.VERSION = '3.3.2'
+ Affix.VERSION = '3.3.4'
Affix.RESET = 'affix affix-top affix-bottom'
diff --git a/js/alert.js b/js/alert.js
index e8212caf01..1925ef011c 100644
--- a/js/alert.js
+++ b/js/alert.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: alert.js v3.3.2
+ * Bootstrap: alert.js v3.3.4
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close)
}
- Alert.VERSION = '3.3.2'
+ Alert.VERSION = '3.3.4'
Alert.TRANSITION_DURATION = 150
diff --git a/js/button.js b/js/button.js
index 4d56901737..7c7c021f95 100644
--- a/js/button.js
+++ b/js/button.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: button.js v3.3.2
+ * Bootstrap: button.js v3.3.4
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
this.isLoading = false
}
- Button.VERSION = '3.3.2'
+ Button.VERSION = '3.3.4'
Button.DEFAULTS = {
loadingText: 'loading...'
diff --git a/js/carousel.js b/js/carousel.js
index c41a0bcb80..a38ef14d0b 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: carousel.js v3.3.2
+ * Bootstrap: carousel.js v3.3.4
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -30,7 +30,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
- Carousel.VERSION = '3.3.2'
+ Carousel.VERSION = '3.3.4'
Carousel.TRANSITION_DURATION = 600
diff --git a/js/collapse.js b/js/collapse.js
index 0394165198..954513c5e1 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: collapse.js v3.3.2
+ * Bootstrap: collapse.js v3.3.4
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -29,7 +29,7 @@
if (this.options.toggle) this.toggle()
}
- Collapse.VERSION = '3.3.2'
+ Collapse.VERSION = '3.3.4'
Collapse.TRANSITION_DURATION = 350
diff --git a/js/dropdown.js b/js/dropdown.js
index 0ba3f87f54..9874600f9d 100644
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: dropdown.js v3.3.2
+ * Bootstrap: dropdown.js v3.3.4
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
$(element).on('click.bs.dropdown', this.toggle)
}
- Dropdown.VERSION = '3.3.2'
+ Dropdown.VERSION = '3.3.4'
Dropdown.prototype.toggle = function (e) {
var $this = $(this)
diff --git a/js/modal.js b/js/modal.js
index 13bcf0af8a..c1eb2a852b 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: modal.js v3.3.2
+ * Bootstrap: modal.js v3.3.4
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -33,7 +33,7 @@
}
}
- Modal.VERSION = '3.3.2'
+ Modal.VERSION = '3.3.4'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
diff --git a/js/popover.js b/js/popover.js
index 479d059c58..0b0755ee27 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: popover.js v3.3.2
+ * Bootstrap: popover.js v3.3.4
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
- Popover.VERSION = '3.3.2'
+ Popover.VERSION = '3.3.4'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
diff --git a/js/scrollspy.js b/js/scrollspy.js
index f2d9b5ab84..f860c1abad 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: scrollspy.js v3.3.2
+ * Bootstrap: scrollspy.js v3.3.4
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -28,7 +28,7 @@
this.process()
}
- ScrollSpy.VERSION = '3.3.2'
+ ScrollSpy.VERSION = '3.3.4'
ScrollSpy.DEFAULTS = {
offset: 10
diff --git a/js/tab.js b/js/tab.js
index 311a01f10b..935d5bc803 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: tab.js v3.3.2
+ * Bootstrap: tab.js v3.3.4
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -17,7 +17,7 @@
this.element = $(element)
}
- Tab.VERSION = '3.3.2'
+ Tab.VERSION = '3.3.4'
Tab.TRANSITION_DURATION = 150
diff --git a/js/tooltip.js b/js/tooltip.js
index 624ade71c3..27367880f7 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: tooltip.js v3.3.2
+ * Bootstrap: tooltip.js v3.3.4
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@@ -25,7 +25,7 @@
this.init('tooltip', element, options)
}
- Tooltip.VERSION = '3.3.2'
+ Tooltip.VERSION = '3.3.4'
Tooltip.TRANSITION_DURATION = 150
diff --git a/js/transition.js b/js/transition.js
index ec9ab68244..f23e6bdfe4 100644
--- a/js/transition.js
+++ b/js/transition.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: transition.js v3.3.2
+ * Bootstrap: transition.js v3.3.4
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
diff --git a/package.js b/package.js
index 8e5e87246c..e42eb98321 100644
--- a/package.js
+++ b/package.js
@@ -3,7 +3,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.2',
+ version: '3.3.4',
git: 'https://github.com/twbs/bootstrap.git'
});
diff --git a/package.json b/package.json
index 4d7b3c9000..5bfb38673d 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.2",
+ "version": "3.3.4",
"keywords": [
"css",
"less",
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index fa413182c2..321fbea9c4 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
{
"name": "bootstrap",
- "version": "3.3.2",
+ "version": "3.3.4",
"npm-shrinkwrap-version": "200.1.0",
"node-version": "v0.12.0",
"dependencies": {