Commit 325748ff authored by Mark Otto's avatar Mark Otto

Merge branch 'master' into v4

Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
parents 0964504f 4fd01b7a
...@@ -196,7 +196,10 @@ included in the project: ...@@ -196,7 +196,10 @@ included in the project:
with a clear title and description against the `master` branch. with a clear title and description against the `master` branch.
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
license your work under the terms of the [MIT License](LICENSE). license your work under the terms of the [MIT License](LICENSE) (if it
includes code changes) and under the terms of the
[Creative Commons Attribution 3.0 Unported License](docs/LICENSE)
(if it includes documentation changes).
### Pull request bots ### Pull request bots
...@@ -239,6 +242,7 @@ Run `grunt test` before committing to ensure your changes follow our coding stan ...@@ -239,6 +242,7 @@ Run `grunt test` before committing to ensure your changes follow our coding stan
## License ## License
By contributing your code, you agree to license your contribution under the [MIT license](LICENSE). By contributing your code, you agree to license your contribution under the [MIT License](LICENSE).
By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](docs/LICENSE).
Prior to v3.1.0, Bootstrap was released under the Apache License v2.0. Prior to v3.1.0, Bootstrap's code was released under the Apache License v2.0.
...@@ -315,6 +315,7 @@ module.exports = function (grunt) { ...@@ -315,6 +315,7 @@ module.exports = function (grunt) {
build: process.env.TRAVIS_JOB_ID, build: process.env.TRAVIS_JOB_ID,
concurrency: 10, concurrency: 10,
maxRetries: 3, maxRetries: 3,
maxPollRetries: 4,
urls: ['http://127.0.0.1:3000/js/tests/index.html'], urls: ['http://127.0.0.1:3000/js/tests/index.html'],
browsers: grunt.file.readYAML('grunt/sauce_browsers.yml') browsers: grunt.file.readYAML('grunt/sauce_browsers.yml')
} }
......
...@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>! ...@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!
Four quick start options are available: Four quick start options are available:
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.1.zip). - [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.2.zip).
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
- Install with [Bower](http://bower.io): `bower install bootstrap`. - Install with [Bower](http://bower.io): `bower install bootstrap`.
- Install with [npm](https://www.npmjs.org): `npm install bootstrap`. - Install with [npm](https://www.npmjs.org): `npm install bootstrap`.
......
...@@ -24,16 +24,16 @@ repo: https://github.com/twbs/bootstrap ...@@ -24,16 +24,16 @@ repo: https://github.com/twbs/bootstrap
sass_repo: https://github.com/twbs/bootstrap-sass sass_repo: https://github.com/twbs/bootstrap-sass
download: download:
source: https://github.com/twbs/bootstrap/archive/v3.3.1.zip source: https://github.com/twbs/bootstrap/archive/v3.3.2.zip
dist: https://github.com/twbs/bootstrap/releases/download/v3.3.1/bootstrap-3.3.1-dist.zip dist: https://github.com/twbs/bootstrap/releases/download/v3.3.2/bootstrap-3.3.2-dist.zip
sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.1.tar.gz sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.2.tar.gz
blog: http://blog.getbootstrap.com blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com expo: http://expo.getbootstrap.com
cdn: cdn:
css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css
js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js
jquery: //code.jquery.com/jquery-2.1.1.min.js jquery: //code.jquery.com/jquery-2.1.1.min.js
bug: bug:
......
{ {
"name": "bootstrap", "name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.3.1", "version": "3.3.2",
"keywords": [ "keywords": [
"css", "css",
"js", "js",
......
/*! /*!
* Bootstrap v3.3.1 (http://getbootstrap.com) * Bootstrap v3.3.2 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
...@@ -9,6 +9,7 @@ if (typeof jQuery === 'undefined') { ...@@ -9,6 +9,7 @@ if (typeof jQuery === 'undefined') {
} }
+function ($) { +function ($) {
'use strict';
var version = $.fn.jquery.split(' ')[0].split('.') var version = $.fn.jquery.split(' ')[0].split('.')
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) { if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher') throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')
...@@ -16,7 +17,7 @@ if (typeof jQuery === 'undefined') { ...@@ -16,7 +17,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: transition.js v3.3.1 * Bootstrap: transition.js v3.3.2
* http://getbootstrap.com/javascript/#transitions * http://getbootstrap.com/javascript/#transitions
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -76,7 +77,7 @@ if (typeof jQuery === 'undefined') { ...@@ -76,7 +77,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: alert.js v3.3.1 * Bootstrap: alert.js v3.3.2
* http://getbootstrap.com/javascript/#alerts * http://getbootstrap.com/javascript/#alerts
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -95,7 +96,7 @@ if (typeof jQuery === 'undefined') { ...@@ -95,7 +96,7 @@ if (typeof jQuery === 'undefined') {
$(el).on('click', dismiss, this.close) $(el).on('click', dismiss, this.close)
} }
Alert.VERSION = '3.3.1' Alert.VERSION = '3.3.2'
Alert.TRANSITION_DURATION = 150 Alert.TRANSITION_DURATION = 150
...@@ -171,7 +172,7 @@ if (typeof jQuery === 'undefined') { ...@@ -171,7 +172,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: button.js v3.3.1 * Bootstrap: button.js v3.3.2
* http://getbootstrap.com/javascript/#buttons * http://getbootstrap.com/javascript/#buttons
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -191,7 +192,7 @@ if (typeof jQuery === 'undefined') { ...@@ -191,7 +192,7 @@ if (typeof jQuery === 'undefined') {
this.isLoading = false this.isLoading = false
} }
Button.VERSION = '3.3.1' Button.VERSION = '3.3.2'
Button.DEFAULTS = { Button.DEFAULTS = {
loadingText: 'loading...' loadingText: 'loading...'
...@@ -288,7 +289,7 @@ if (typeof jQuery === 'undefined') { ...@@ -288,7 +289,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: carousel.js v3.3.1 * Bootstrap: carousel.js v3.3.2
* http://getbootstrap.com/javascript/#carousel * http://getbootstrap.com/javascript/#carousel
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -319,7 +320,7 @@ if (typeof jQuery === 'undefined') { ...@@ -319,7 +320,7 @@ if (typeof jQuery === 'undefined') {
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
} }
Carousel.VERSION = '3.3.1' Carousel.VERSION = '3.3.2'
Carousel.TRANSITION_DURATION = 600 Carousel.TRANSITION_DURATION = 600
...@@ -526,7 +527,7 @@ if (typeof jQuery === 'undefined') { ...@@ -526,7 +527,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: collapse.js v3.3.1 * Bootstrap: collapse.js v3.3.2
* http://getbootstrap.com/javascript/#collapse * http://getbootstrap.com/javascript/#collapse
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -555,7 +556,7 @@ if (typeof jQuery === 'undefined') { ...@@ -555,7 +556,7 @@ if (typeof jQuery === 'undefined') {
if (this.options.toggle) this.toggle() if (this.options.toggle) this.toggle()
} }
Collapse.VERSION = '3.3.1' Collapse.VERSION = '3.3.2'
Collapse.TRANSITION_DURATION = 350 Collapse.TRANSITION_DURATION = 350
...@@ -738,7 +739,7 @@ if (typeof jQuery === 'undefined') { ...@@ -738,7 +739,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: dropdown.js v3.3.1 * Bootstrap: dropdown.js v3.3.2
* http://getbootstrap.com/javascript/#dropdowns * http://getbootstrap.com/javascript/#dropdowns
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -758,7 +759,7 @@ if (typeof jQuery === 'undefined') { ...@@ -758,7 +759,7 @@ if (typeof jQuery === 'undefined') {
$(element).on('click.bs.dropdown', this.toggle) $(element).on('click.bs.dropdown', this.toggle)
} }
Dropdown.VERSION = '3.3.1' Dropdown.VERSION = '3.3.2'
Dropdown.prototype.toggle = function (e) { Dropdown.prototype.toggle = function (e) {
var $this = $(this) var $this = $(this)
...@@ -900,7 +901,7 @@ if (typeof jQuery === 'undefined') { ...@@ -900,7 +901,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: modal.js v3.3.1 * Bootstrap: modal.js v3.3.2
* http://getbootstrap.com/javascript/#modals * http://getbootstrap.com/javascript/#modals
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -931,7 +932,7 @@ if (typeof jQuery === 'undefined') { ...@@ -931,7 +932,7 @@ if (typeof jQuery === 'undefined') {
} }
} }
Modal.VERSION = '3.3.1' Modal.VERSION = '3.3.2'
Modal.TRANSITION_DURATION = 300 Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150 Modal.BACKDROP_TRANSITION_DURATION = 150
...@@ -1225,7 +1226,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1225,7 +1226,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: tooltip.js v3.3.1 * Bootstrap: tooltip.js v3.3.2
* http://getbootstrap.com/javascript/#tooltip * http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* ======================================================================== * ========================================================================
...@@ -1251,7 +1252,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1251,7 +1252,7 @@ if (typeof jQuery === 'undefined') {
this.init('tooltip', element, options) this.init('tooltip', element, options)
} }
Tooltip.VERSION = '3.3.1' Tooltip.VERSION = '3.3.2'
Tooltip.TRANSITION_DURATION = 150 Tooltip.TRANSITION_DURATION = 150
...@@ -1698,7 +1699,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1698,7 +1699,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: popover.js v3.3.1 * Bootstrap: popover.js v3.3.2
* http://getbootstrap.com/javascript/#popovers * http://getbootstrap.com/javascript/#popovers
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -1718,7 +1719,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1718,7 +1719,7 @@ if (typeof jQuery === 'undefined') {
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.1' Popover.VERSION = '3.3.2'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right', placement: 'right',
...@@ -1812,7 +1813,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1812,7 +1813,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: scrollspy.js v3.3.1 * Bootstrap: scrollspy.js v3.3.2
* http://getbootstrap.com/javascript/#scrollspy * http://getbootstrap.com/javascript/#scrollspy
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -1843,7 +1844,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1843,7 +1844,7 @@ if (typeof jQuery === 'undefined') {
this.process() this.process()
} }
ScrollSpy.VERSION = '3.3.1' ScrollSpy.VERSION = '3.3.2'
ScrollSpy.DEFAULTS = { ScrollSpy.DEFAULTS = {
offset: 10 offset: 10
...@@ -1988,7 +1989,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1988,7 +1989,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: tab.js v3.3.1 * Bootstrap: tab.js v3.3.2
* http://getbootstrap.com/javascript/#tabs * http://getbootstrap.com/javascript/#tabs
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -2006,7 +2007,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2006,7 +2007,7 @@ if (typeof jQuery === 'undefined') {
this.element = $(element) this.element = $(element)
} }
Tab.VERSION = '3.3.1' Tab.VERSION = '3.3.2'
Tab.TRANSITION_DURATION = 150 Tab.TRANSITION_DURATION = 150
...@@ -2142,7 +2143,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2142,7 +2143,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: affix.js v3.3.1 * Bootstrap: affix.js v3.3.2
* http://getbootstrap.com/javascript/#affix * http://getbootstrap.com/javascript/#affix
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -2171,7 +2172,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2171,7 +2172,7 @@ if (typeof jQuery === 'undefined') {
this.checkPosition() this.checkPosition()
} }
Affix.VERSION = '3.3.1' Affix.VERSION = '3.3.2'
Affix.RESET = 'affix affix-top affix-bottom' Affix.RESET = 'affix affix-top affix-bottom'
......
...@@ -102,21 +102,21 @@ ...@@ -102,21 +102,21 @@
browser: > browser: >
Chrome Chrome
summary: > summary: >
`<input type="password">` sporadically causes bad widths on floated elements. CSS infinite linear animation with alpha transparency leaks memory.
upstream_bug: > upstream_bug: >
Chromium#377346 Chromium#429375
origin: > origin: >
Bootstrap#13892 Bootstrap#14409
- -
browser: > browser: >
Chrome Chrome (Windows & Linux)
summary: > summary: >
CSS infinite linear animation with alpha transparency leaks memory. Animation glitch when returning to inactive tab after animations occurred while tab was hidden.
upstream_bug: > upstream_bug: >
Chromium#429375 Chromium#449180
origin: > origin: >
Bootstrap#14409 Bootstrap#15298
- -
browser: > browser: >
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
summary: > summary: >
Small font size when printing webpage with fixed-width `.container`. Small font size when printing webpage with fixed-width `.container`.
upstream_bug: > upstream_bug: >
WebKit#138192 WebKit#138192, Safari#19435018
origin: > origin: >
Bootstrap#14868 Bootstrap#14868
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
summary: > summary: >
Alpha linear-gradient has dark line at its edge. Alpha linear-gradient has dark line at its edge.
upstream_bug: > upstream_bug: >
WebKit#139803 WebKit#139803, Safari#19434933
origin: > origin: >
Bootstrap#15205 Bootstrap#15205
...@@ -196,6 +196,6 @@ ...@@ -196,6 +196,6 @@
summary: > summary: >
`display: block` causes text of temporal `<input>`s to become vertically misaligned `display: block` causes text of temporal `<input>`s to become vertically misaligned
upstream_bug: > upstream_bug: >
WebKit#139848 WebKit#139848, Safari#19434878
origin: > origin: >
Bootstrap#11266, Bootstrap#13098 Bootstrap#11266, Bootstrap#13098
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
{% if site.github %} {% if site.github %}
<script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script> <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
{% else %} {% else %}
......
...@@ -40,10 +40,10 @@ Individual form controls automatically receive some global styling. All textual ...@@ -40,10 +40,10 @@ Individual form controls automatically receive some global styling. All textual
## Inline forms ## Inline forms
Add `.form-inline` to your `<form>` for left-aligned and inline-block controls. **This only applies to forms within viewports that are at least 768px wide.** Add `.form-inline` to your `<form>` or a parent element for left-aligned and inline-block controls. **This only applies to form controls within viewports that are at least 768px wide.**
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
<h4>Requires custom widths</h4> <h4>May require custom widths</h4>
<p>Inputs and selects have `width: 100%;` applied by default in Bootstrap. Within inline forms, we reset that to `width: auto;` so multiple controls can reside on the same line. Depending on your layout, additional custom widths may be required.</p> <p>Inputs and selects have `width: 100%;` applied by default in Bootstrap. Within inline forms, we reset that to `width: auto;` so multiple controls can reside on the same line. Depending on your layout, additional custom widths may be required.</p>
</div> </div>
<div class="bs-callout bs-callout-warning"> <div class="bs-callout bs-callout-warning">
...@@ -51,15 +51,35 @@ Add `.form-inline` to your `<form>` for left-aligned and inline-block controls. ...@@ -51,15 +51,35 @@ Add `.form-inline` to your `<form>` for left-aligned and inline-block controls.
<p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline forms, you can hide the labels using the `.sr-only` class.</p> <p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline forms, you can hide the labels using the `.sr-only` class.</p>
</div> </div>
### Visible labels
{% example html %}
<div class="bs-example" data-example-id="simple-form-inline">
<form class="form-inline">
<div class="form-group">
<label for="exampleInputName2">Name</label>
<input type="text" class="form-control" id="exampleInputName2" placeholder="Jane Doe">
</div>
<div class="form-group">
<label for="exampleInputEmail2">Email</label>
<input type="email" class="form-control" id="exampleInputEmail2" placeholder="jane.doe@example.com">
</div>
<button type="submit" class="btn btn-default">Send invitation</button>
</form>
</div>
{% endexample %}
### Hidden labels
{% example html %} {% example html %}
<form class="form-inline"> <form class="form-inline">
<div class="form-group"> <div class="form-group">
<label class="sr-only" for="exampleInputEmail2">Email address</label> <label class="sr-only" for="exampleInputEmail3">Email address</label>
<input type="email" class="form-control" id="exampleInputEmail2" placeholder="Enter email"> <input type="email" class="form-control" id="exampleInputEmail3" placeholder="Enter email">
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="sr-only" for="exampleInputPassword2">Password</label> <label class="sr-only" for="exampleInputPassword3">Password</label>
<input type="password" class="form-control" id="exampleInputPassword2" placeholder="Password"> <input type="password" class="form-control" id="exampleInputPassword3" placeholder="Password">
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
...@@ -86,7 +106,7 @@ Add `.form-inline` to your `<form>` for left-aligned and inline-block controls. ...@@ -86,7 +106,7 @@ Add `.form-inline` to your `<form>` for left-aligned and inline-block controls.
## Horizontal forms ## Horizontal forms
Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout by adding `.form-horizontal` to the form. Doing so changes `.form-group`s to behave as grid rows, so no need for `.row`. Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout by adding `.form-horizontal` to the form or form control's parent. Doing so changes `.form-group`s to behave as grid rows, so no need for `.row`.
{% example html %} {% example html %}
<form class="form-horizontal"> <form class="form-horizontal">
...@@ -410,18 +430,30 @@ You can also add optional feedback icons with the addition of `.has-feedback` an ...@@ -410,18 +430,30 @@ You can also add optional feedback icons with the addition of `.has-feedback` an
{% example html %} {% example html %}
<div class="form-group has-success has-feedback"> <div class="form-group has-success has-feedback">
<label class="control-label" for="inputSuccess2">Input with success</label> <label class="control-label" for="inputSuccess2">Input with success</label>
<input type="text" class="form-control" id="inputSuccess2"> <input type="text" class="form-control" id="inputSuccess2" aria-describedby="inputSuccess2Status">
<span class="glyphicon glyphicon-ok form-control-feedback"></span> <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
<span id="inputSuccess2Status" class="sr-only">(success)</span>
</div> </div>
<div class="form-group has-warning has-feedback"> <div class="form-group has-warning has-feedback">
<label class="control-label" for="inputWarning2">Input with warning</label> <label class="control-label" for="inputWarning2">Input with warning</label>
<input type="text" class="form-control" id="inputWarning2"> <input type="text" class="form-control" id="inputWarning2" aria-describedby="inputWarning2Status">
<span class="glyphicon glyphicon-warning-sign form-control-feedback"></span> <span class="glyphicon glyphicon-warning-sign form-control-feedback" aria-hidden="true"></span>
<span id="inputWarning2Status" class="sr-only">(warning)</span>
</div> </div>
<div class="form-group has-error has-feedback"> <div class="form-group has-error has-feedback">
<label class="control-label" for="inputError2">Input with error</label> <label class="control-label" for="inputError2">Input with error</label>
<input type="text" class="form-control" id="inputError2"> <input type="text" class="form-control" id="inputError2" aria-describedby="inputError2Status">
<span class="glyphicon glyphicon-remove form-control-feedback"></span> <span class="glyphicon glyphicon-remove form-control-feedback" aria-hidden="true"></span>
<span id="inputError2Status" class="sr-only">(error)</span>
</div>
<div class="form-group has-success has-feedback">
<label class="control-label" for="inputGroupSuccess1">Input group with success</label>
<div class="input-group">
<span class="input-group-addon">@</span>
<input type="text" class="form-control" id="inputGroupSuccess1" aria-describedby="inputGroupSuccess1Status">
</div>
<span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
<span id="inputGroupSuccess1Status" class="sr-only">(success)</span>
</div> </div>
{% endexample %} {% endexample %}
...@@ -434,6 +466,18 @@ You can also add optional feedback icons with the addition of `.has-feedback` an ...@@ -434,6 +466,18 @@ You can also add optional feedback icons with the addition of `.has-feedback` an
<span class="glyphicon glyphicon-ok form-control-feedback"></span> <span class="glyphicon glyphicon-ok form-control-feedback"></span>
</div> </div>
</div> </div>
<br>
<div class="form-group has-success has-feedback">
<label class="control-label col-sm-3" for="inputGroupSuccess2">Input group with success</label>
<div class="col-sm-9">
<div class="input-group">
<span class="input-group-addon">@</span>
<input type="text" class="form-control" id="inputGroupSuccess2" aria-describedby="inputGroupSuccess2Status">
</div>
<span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
<span id="inputGroupSuccess2Status" class="sr-only">(success)</span>
</div>
</div>
</form> </form>
{% endexample %} {% endexample %}
...@@ -447,6 +491,18 @@ You can also add optional feedback icons with the addition of `.has-feedback` an ...@@ -447,6 +491,18 @@ You can also add optional feedback icons with the addition of `.has-feedback` an
</form> </form>
{% endexample %} {% endexample %}
{% example html %}
<div class="form-group has-success has-feedback">
<label class="control-label sr-only" for="inputGroupSuccess4">Input group with success</label>
<div class="input-group">
<span class="input-group-addon">@</span>
<input type="text" class="form-control" id="inputGroupSuccess4" aria-describedby="inputGroupSuccess4Status">
</div>
<span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
<span id="inputGroupSuccess4Status" class="sr-only">(success)</span>
</div>
{% endexample %}
For form controls with no visible label, add the `.sr-only` class on the label. Bootstrap will automatically adjust the position of the icon once it's been added. For form controls with no visible label, add the `.sr-only` class on the label. Bootstrap will automatically adjust the position of the icon once it's been added.
{% example html %} {% example html %}
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../assets/js/docs.min.js"></script> <script src="../../assets/js/docs.min.js"></script>
</body> </body>
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../assets/js/docs.min.js"></script> <script src="../../assets/js/docs.min.js"></script>
</body> </body>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../assets/js/docs.min.js"></script> <script src="../../assets/js/docs.min.js"></script>
</body> </body>
......
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../assets/js/docs.min.js"></script> <script src="../../assets/js/docs.min.js"></script>
</body> </body>
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="offcanvas.js"></script> <script src="offcanvas.js"></script>
</body> </body>
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="tooltip-viewport.js"></script> <script src="tooltip-viewport.js"></script>
</body> </body>
......
...@@ -45,6 +45,13 @@ Bootstrap is available as [an npm package](https://www.npmjs.org/package/bootstr ...@@ -45,6 +45,13 @@ Bootstrap is available as [an npm package](https://www.npmjs.org/package/bootstr
{% highlight bash %}$ npm install bootstrap{% endhighlight %} {% highlight bash %}$ npm install bootstrap{% endhighlight %}
### Autoprefixer required for Less/Sass `require('bootstrap')` will load all of Bootstrap's jQuery plugins onto the jQuery object. The `bootstrap` module itself does not export anything. You can manually load Bootstrap's jQuery plugins individually by loading the `/js/*.js` files under the package's top-level directory.
Bootstrap uses [Autoprefixer](https://github.com/postcss/autoprefixer) to deal with [CSS vendor prefixes](http://webdesign.about.com/od/css/a/css-vendor-prefixes.htm). If you're compiling Bootstrap from its Less/Sass source and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this because Autoprefixer is already integrated into our Gruntfile. Bootstrap's `package.json` contains some additional metadata under the following keys:
- `less` - path to Bootstrap's main [Less](http://lesscss.org) source file
- `style` - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization)
### Autoprefixer required
Bootstrap uses [Autoprefixer](https://github.com/postcss/autoprefixer) to deal with [CSS vendor prefixes](http://webdesign.about.com/od/css/a/css-vendor-prefixes.htm). If you're compiling Bootstrap from its source Sass and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this as Autoprefixer is already integrated into our Gruntfile.
...@@ -133,7 +133,7 @@ Use the `focus` trigger to dismiss popovers on the next click that the user make ...@@ -133,7 +133,7 @@ Use the `focus` trigger to dismiss popovers on the next click that the user make
</div> </div>
{% example html %} {% example html %}
<a href="#" tabindex="0" class="btn btn-lg btn-danger bs-docs-popover" role="button" data-toggle="popover" data-trigger="focus" title="Dismissible popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissible popover</a> <a tabindex="0" class="btn btn-lg btn-danger bs-docs-popover" role="button" data-toggle="popover" data-trigger="focus" title="Dismissible popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissible popover</a>
{% endexample %} {% endexample %}
{% highlight js %} {% highlight js %}
...@@ -271,19 +271,19 @@ Initializes popovers for an element collection. ...@@ -271,19 +271,19 @@ Initializes popovers for an element collection.
#### .popover('show') #### .popover('show')
Reveals an element's popover. Popovers whose both title and content are zero-length are never displayed. Reveals an element's popover. **Returns to the caller before the popover has actually been shown** (i.e. before the `shown.bs.popover` event occurs). This is considered a "manual" triggering of the popover. Popovers whose both title and content are zero-length are never displayed.
{% highlight js %}$('#element').popover('show'){% endhighlight %} {% highlight js %}$('#element').popover('show'){% endhighlight %}
#### .popover('hide') #### .popover('hide')
Hides an element's popover. Hides an element's popover. **Returns to the caller before the popover has actually been hidden** (i.e. before the `hidden.bs.popover` event occurs). This is considered a "manual" triggering of the popover.
{% highlight js %}$('#element').popover('hide'){% endhighlight %} {% highlight js %}$('#element').popover('hide'){% endhighlight %}
#### .popover('toggle') #### .popover('toggle')
Toggles an element's popover. Toggles an element's popover. **Returns to the caller before the popover has actually been shown or hidden** (i.e. before the `shown.bs.popover` or `hidden.bs.popover` event occurs). This is considered a "manual" triggering of the popover.
{% highlight js %}$('#element').popover('toggle'){% endhighlight %} {% highlight js %}$('#element').popover('toggle'){% endhighlight %}
......
...@@ -241,19 +241,19 @@ Attaches a tooltip handler to an element collection. ...@@ -241,19 +241,19 @@ Attaches a tooltip handler to an element collection.
#### .tooltip('show') #### .tooltip('show')
Reveals an element's tooltip. Tooltips with zero-length titles are never displayed. Reveals an element's tooltip. **Returns to the caller before the tooltip has actually been shown** (i.e. before the `shown.bs.tooltip` event occurs). This is considered a "manual" triggering of the tooltip. Tooltips with zero-length titles are never displayed.
{% highlight js %}$('#element').tooltip('show'){% endhighlight %} {% highlight js %}$('#element').tooltip('show'){% endhighlight %}
#### .tooltip('hide') #### .tooltip('hide')
Hides an element's tooltip. Hides an element's tooltip. **Returns to the caller before the tooltip has actually been hidden** (i.e. before the `hidden.bs.tooltip` event occurs). This is considered a "manual" triggering of the tooltip.
{% highlight js %}$('#element').tooltip('hide'){% endhighlight %} {% highlight js %}$('#element').tooltip('hide'){% endhighlight %}
#### .tooltip('toggle') #### .tooltip('toggle')
Toggles an element's tooltip. Toggles an element's tooltip. **Returns to the caller before the tooltip has actually been shown or hidden** (i.e. before the `shown.bs.tooltip` or `hidden.bs.tooltip` event occurs). This is considered a "manual" triggering of the tooltip.
{% highlight js %}$('#element').tooltip('toggle'){% endhighlight %} {% highlight js %}$('#element').tooltip('toggle'){% endhighlight %}
......
...@@ -355,7 +355,7 @@ Move columns to the right using `.col-md-offset-*` classes. These classes increa ...@@ -355,7 +355,7 @@ Move columns to the right using `.col-md-offset-*` classes. These classes increa
### Example: Nesting columns ### Example: Nesting columns
To nest your content with the default grid, add a new `.row` and set of `.col-sm-*` columns within an existing `.col-sm-*` column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns). To nest your content with the default grid, add a new `.row` and set of `.col-sm-*` columns within an existing `.col-sm-*` column. Nested rows should include a set of columns that add up to 12 or fewer (it is not required that you use all 12 available columns).
{% example html %} {% example html %}
<div class="row"> <div class="row">
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"requireSpaceBetweenArguments": true, "requireSpaceBetweenArguments": true,
"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true }, "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
"requireSpacesInConditionalExpression": true, "requireSpacesInConditionalExpression": true,
"requireSpacesInForStatement": true,
"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true }, "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true }, "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
......
/* ======================================================================== /* ========================================================================
* Bootstrap: affix.js v3.3.1 * Bootstrap: affix.js v3.3.2
* http://getbootstrap.com/javascript/#affix * http://getbootstrap.com/javascript/#affix
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
this.checkPosition() this.checkPosition()
} }
Affix.VERSION = '3.3.1' Affix.VERSION = '3.3.2'
Affix.RESET = 'affix affix-top affix-bottom' Affix.RESET = 'affix affix-top affix-bottom'
......
/* ======================================================================== /* ========================================================================
* Bootstrap: alert.js v3.3.1 * Bootstrap: alert.js v3.3.2
* http://getbootstrap.com/javascript/#alerts * http://getbootstrap.com/javascript/#alerts
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close) $(el).on('click', dismiss, this.close)
} }
Alert.VERSION = '3.3.1' Alert.VERSION = '3.3.2'
Alert.TRANSITION_DURATION = 150 Alert.TRANSITION_DURATION = 150
......
/* ======================================================================== /* ========================================================================
* Bootstrap: button.js v3.3.1 * Bootstrap: button.js v3.3.2
* http://getbootstrap.com/javascript/#buttons * http://getbootstrap.com/javascript/#buttons
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
this.isLoading = false this.isLoading = false
} }
Button.VERSION = '3.3.1' Button.VERSION = '3.3.2'
Button.DEFAULTS = { Button.DEFAULTS = {
loadingText: 'loading...' loadingText: 'loading...'
......
/* ======================================================================== /* ========================================================================
* Bootstrap: carousel.js v3.3.1 * Bootstrap: carousel.js v3.3.2
* http://getbootstrap.com/javascript/#carousel * http://getbootstrap.com/javascript/#carousel
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
} }
Carousel.VERSION = '3.3.1' Carousel.VERSION = '3.3.2'
Carousel.TRANSITION_DURATION = 600 Carousel.TRANSITION_DURATION = 600
......
/* ======================================================================== /* ========================================================================
* Bootstrap: collapse.js v3.3.1 * Bootstrap: collapse.js v3.3.2
* http://getbootstrap.com/javascript/#collapse * http://getbootstrap.com/javascript/#collapse
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
if (this.options.toggle) this.toggle() if (this.options.toggle) this.toggle()
} }
Collapse.VERSION = '3.3.1' Collapse.VERSION = '3.3.2'
Collapse.TRANSITION_DURATION = 350 Collapse.TRANSITION_DURATION = 350
......
/* ======================================================================== /* ========================================================================
* Bootstrap: dropdown.js v3.3.1 * Bootstrap: dropdown.js v3.3.2
* http://getbootstrap.com/javascript/#dropdowns * http://getbootstrap.com/javascript/#dropdowns
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
$(element).on('click.bs.dropdown', this.toggle) $(element).on('click.bs.dropdown', this.toggle)
} }
Dropdown.VERSION = '3.3.1' Dropdown.VERSION = '3.3.2'
Dropdown.prototype.toggle = function (e) { Dropdown.prototype.toggle = function (e) {
var $this = $(this) var $this = $(this)
......
/* ======================================================================== /* ========================================================================
* Bootstrap: modal.js v3.3.1 * Bootstrap: modal.js v3.3.2
* http://getbootstrap.com/javascript/#modals * http://getbootstrap.com/javascript/#modals
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
} }
} }
Modal.VERSION = '3.3.1' Modal.VERSION = '3.3.2'
Modal.TRANSITION_DURATION = 300 Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150 Modal.BACKDROP_TRANSITION_DURATION = 150
......
/* ======================================================================== /* ========================================================================
* Bootstrap: popover.js v3.3.1 * Bootstrap: popover.js v3.3.2
* http://getbootstrap.com/javascript/#popovers * http://getbootstrap.com/javascript/#popovers
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.1' Popover.VERSION = '3.3.2'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right', placement: 'right',
......
/* ======================================================================== /* ========================================================================
* Bootstrap: scrollspy.js v3.3.1 * Bootstrap: scrollspy.js v3.3.2
* http://getbootstrap.com/javascript/#scrollspy * http://getbootstrap.com/javascript/#scrollspy
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
this.process() this.process()
} }
ScrollSpy.VERSION = '3.3.1' ScrollSpy.VERSION = '3.3.2'
ScrollSpy.DEFAULTS = { ScrollSpy.DEFAULTS = {
offset: 10 offset: 10
......
/* ======================================================================== /* ========================================================================
* Bootstrap: tab.js v3.3.1 * Bootstrap: tab.js v3.3.2
* http://getbootstrap.com/javascript/#tabs * http://getbootstrap.com/javascript/#tabs
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
this.element = $(element) this.element = $(element)
} }
Tab.VERSION = '3.3.1' Tab.VERSION = '3.3.2'
Tab.TRANSITION_DURATION = 150 Tab.TRANSITION_DURATION = 150
......
This source diff could not be displayed because it is too large. You can view the blob instead.
/* ======================================================================== /* ========================================================================
* Bootstrap: tooltip.js v3.3.1 * Bootstrap: tooltip.js v3.3.2
* http://getbootstrap.com/javascript/#tooltip * http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* ======================================================================== * ========================================================================
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
this.init('tooltip', element, options) this.init('tooltip', element, options)
} }
Tooltip.VERSION = '3.3.1' Tooltip.VERSION = '3.3.2'
Tooltip.TRANSITION_DURATION = 150 Tooltip.TRANSITION_DURATION = 150
......
/* ======================================================================== /* ========================================================================
* Bootstrap: transition.js v3.3.1 * Bootstrap: transition.js v3.3.2
* http://getbootstrap.com/javascript/#transitions * http://getbootstrap.com/javascript/#transitions
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
......
{ {
"name": "bootstrap", "name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.3.1", "version": "4.0.0-alpha",
"keywords": [ "keywords": [
"css", "css",
"sass", "sass",
...@@ -32,16 +32,16 @@ ...@@ -32,16 +32,16 @@
}, },
"devDependencies": { "devDependencies": {
"btoa": "~1.1.2", "btoa": "~1.1.2",
"glob": "~4.3.1", "glob": "~4.3.5",
"grunt": "~0.4.5", "grunt": "~0.4.5",
"grunt-autoprefixer": "~2.0.0", "grunt-autoprefixer": "~2.2.0",
"grunt-banner": "~0.2.3", "grunt-banner": "~0.3.1",
"grunt-contrib-clean": "~0.6.0", "grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compress": "~0.13.0", "grunt-contrib-compress": "~0.13.0",
"grunt-contrib-concat": "~0.5.0", "grunt-contrib-concat": "~0.5.0",
"grunt-contrib-connect": "~0.9.0", "grunt-contrib-connect": "~0.9.0",
"grunt-contrib-copy": "~0.7.0", "grunt-contrib-copy": "~0.7.0",
"grunt-contrib-csslint": "~0.3.1", "grunt-contrib-csslint": "~0.4.0",
"grunt-contrib-cssmin": "~0.11.0", "grunt-contrib-cssmin": "~0.11.0",
"grunt-contrib-jade": "~0.14.0", "grunt-contrib-jade": "~0.14.0",
"grunt-contrib-jshint": "~0.10.0", "grunt-contrib-jshint": "~0.10.0",
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
"grunt-exec": "~0.4.6", "grunt-exec": "~0.4.6",
"grunt-html-validation": "~0.1.18", "grunt-html-validation": "~0.1.18",
"grunt-jekyll": "~0.4.2", "grunt-jekyll": "~0.4.2",
"grunt-jscs": "~1.1.0", "grunt-jscs": "~1.2.0",
"grunt-sass": "~0.17.0", "grunt-sass": "~0.17.0",
"grunt-saucelabs": "~8.4.0", "grunt-saucelabs": "~8.4.1",
"grunt-scss-lint": "^0.3.4", "grunt-scss-lint": "^0.3.4",
"grunt-sed": "~0.1.1", "grunt-sed": "~0.1.1",
"load-grunt-tasks": "~2.0.0", "load-grunt-tasks": "~2.0.0",
......
...@@ -75,13 +75,13 @@ ...@@ -75,13 +75,13 @@
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
} }
.btn-group > .btn-group:first-child { .btn-group > .btn-group:first-child:not(:last-child) {
> .btn:last-child, > .btn:last-child,
> .dropdown-toggle { > .dropdown-toggle {
@include border-right-radius(0); @include border-right-radius(0);
} }
} }
.btn-group > .btn-group:last-child > .btn:first-child { .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
@include border-left-radius(0); @include border-left-radius(0);
} }
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
&:hover, &:hover,
&:focus { &:focus {
color: $link-hover-color; color: $link-hover-color;
text-decoration: underline; text-decoration: $link-hover-decoration;
background-color: transparent; background-color: transparent;
} }
&:disabled, &:disabled,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
// -------------------------------------------------- // --------------------------------------------------
// The dropdown wrapper (div) // The dropdown wrapper (div)
.dropup,
.dropdown { .dropdown {
position: relative; position: relative;
} }
......
...@@ -121,8 +121,9 @@ output { ...@@ -121,8 +121,9 @@ output {
line-height: $line-height-base; line-height: $line-height-base;
color: $input-color; color: $input-color;
background-color: $input-bg; background-color: $input-bg;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid $input-border; border: 1px solid $input-border;
@include border-radius($input-border-radius); @include border-radius($input-border-radius); // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
...@@ -319,12 +320,27 @@ input[type="checkbox"] { ...@@ -319,12 +320,27 @@ input[type="checkbox"] {
.form-group-sm { .form-group-sm {
@include input-size('.form-control', $input-height-sm, $padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $input-border-radius-sm); @include input-size('.form-control', $input-height-sm, $padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $input-border-radius-sm);
.form-control-static {
height: $input-height-sm;
padding: $padding-sm-vertical $padding-sm-horizontal;
font-size: $font-size-sm;
line-height: $line-height-sm;
}
}
} }
@include input-size('.input-lg', $input-height-lg, $padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $input-border-radius-lg); @include input-size('.input-lg', $input-height-lg, $padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $input-border-radius-lg);
.form-group-lg { .form-group-lg {
@include input-size('.form-control', $input-height-lg, $padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $input-border-radius-lg); @include input-size('.form-control', $input-height-lg, $padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $input-border-radius-lg);
.form-control-static {
height: $input-height-lg;
padding: $padding-lg-vertical $padding-lg-horizontal;
font-size: $font-size-lg;
line-height: $line-height-lg;
}
} }
......
...@@ -88,7 +88,7 @@ th { ...@@ -88,7 +88,7 @@ th {
// Default zebra-stripe styles (alternating gray and transparent backgrounds) // Default zebra-stripe styles (alternating gray and transparent backgrounds)
.table-striped { .table-striped {
tbody tr:nth-child(odd) { tbody tr:nth-of-type(odd) {
background-color: $table-bg-accent; background-color: $table-bg-accent;
} }
} }
......
...@@ -103,7 +103,7 @@ $padding-sm-horizontal: .75rem !default; ...@@ -103,7 +103,7 @@ $padding-sm-horizontal: .75rem !default;
$padding-xs-vertical: .2rem !default; $padding-xs-vertical: .2rem !default;
$padding-xs-horizontal: .5rem !default; $padding-xs-horizontal: .5rem !default;
$line-height-lg: 1.33 !default; $line-height-lg: 1.3333333 !default;
$line-height-sm: 1.5 !default; $line-height-sm: 1.5 !default;
$border-radius-base: .25rem !default; $border-radius-base: .25rem !default;
......
{ {
"name": "bootstrap", "name": "bootstrap",
"version": "3.3.1", "version": "3.3.2",
"npm-shrinkwrap-version": "200.0.0", "npm-shrinkwrap-version": "200.0.0",
"dependencies": { "dependencies": {
"btoa": { "btoa": {
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
"resolved": "https://registry.npmjs.org/btoa/-/btoa-1.1.2.tgz" "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.1.2.tgz"
}, },
"glob": { "glob": {
"version": "4.3.2", "version": "4.3.5",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.3.2.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
"dependencies": { "dependencies": {
"inflight": { "inflight": {
"version": "1.0.4", "version": "1.0.4",
...@@ -170,10 +170,6 @@ ...@@ -170,10 +170,6 @@
"underscore.string": { "underscore.string": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz" "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
},
"which": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/which/-/which-1.0.8.tgz"
} }
} }
}, },
...@@ -252,28 +248,32 @@ ...@@ -252,28 +248,32 @@
} }
}, },
"grunt-autoprefixer": { "grunt-autoprefixer": {
"version": "2.0.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-2.0.0.tgz", "resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-2.2.0.tgz",
"dependencies": { "dependencies": {
"autoprefixer-core": { "autoprefixer-core": {
"version": "4.0.2", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-4.0.2.tgz", "resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-5.0.0.tgz",
"dependencies": { "dependencies": {
"browserslist": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-0.1.1.tgz"
},
"caniuse-db": { "caniuse-db": {
"version": "1.0.30000040", "version": "1.0.30000048",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000040.tgz" "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000048.tgz"
}, },
"postcss": { "postcss": {
"version": "3.0.7", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-3.0.7.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-4.0.1.tgz",
"dependencies": { "dependencies": {
"js-base64": { "js-base64": {
"version": "2.1.5", "version": "2.1.7",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.5.tgz" "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.7.tgz"
}, },
"source-map": { "source-map": {
"version": "0.1.41", "version": "0.1.43",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.41.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"dependencies": { "dependencies": {
"amdefine": { "amdefine": {
"version": "0.1.0", "version": "0.1.0",
...@@ -324,14 +324,14 @@ ...@@ -324,14 +324,14 @@
} }
}, },
"diff": { "diff": {
"version": "1.0.8", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz" "resolved": "https://registry.npmjs.org/diff/-/diff-1.2.1.tgz"
} }
} }
}, },
"grunt-banner": { "grunt-banner": {
"version": "0.2.3", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/grunt-banner/-/grunt-banner-0.2.3.tgz" "resolved": "https://registry.npmjs.org/grunt-banner/-/grunt-banner-0.3.1.tgz"
}, },
"grunt-contrib-clean": { "grunt-contrib-clean": {
"version": "0.6.0", "version": "0.6.0",
...@@ -348,8 +348,8 @@ ...@@ -348,8 +348,8 @@
"resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.13.0.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.13.0.tgz",
"dependencies": { "dependencies": {
"archiver": { "archiver": {
"version": "0.13.0", "version": "0.13.1",
"resolved": "https://registry.npmjs.org/archiver/-/archiver-0.13.0.tgz", "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.13.1.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "0.9.0", "version": "0.9.0",
...@@ -359,50 +359,6 @@ ...@@ -359,50 +359,6 @@
"version": "0.2.5", "version": "0.2.5",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz" "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
}, },
"glob": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.2.2.tgz",
"dependencies": {
"inflight": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
"dependencies": {
"wrappy": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
}
}
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"minimatch": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
"dependencies": {
"lru-cache": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
},
"sigmund": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
}
}
},
"once": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
"dependencies": {
"wrappy": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
}
}
}
}
},
"lazystream": { "lazystream": {
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz" "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz"
...@@ -434,12 +390,36 @@ ...@@ -434,12 +390,36 @@
} }
}, },
"tar-stream": { "tar-stream": {
"version": "1.1.1", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.1.tgz", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.2.tgz",
"dependencies": { "dependencies": {
"bl": { "bl": {
"version": "0.9.3", "version": "0.9.3",
"resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz" "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
"dependencies": {
"readable-stream": {
"version": "1.0.33",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
"dependencies": {
"core-util-is": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
}
}
}
}
}, },
"end-of-stream": { "end-of-stream": {
"version": "1.1.0", "version": "1.1.0",
...@@ -458,8 +438,8 @@ ...@@ -458,8 +438,8 @@
} }
}, },
"readable-stream": { "readable-stream": {
"version": "1.0.33", "version": "1.1.13",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
"dependencies": { "dependencies": {
"core-util-is": { "core-util-is": {
"version": "1.0.1", "version": "1.0.1",
...@@ -486,16 +466,20 @@ ...@@ -486,16 +466,20 @@
} }
}, },
"zip-stream": { "zip-stream": {
"version": "0.4.1", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.5.0.tgz",
"dependencies": { "dependencies": {
"compress-commons": { "compress-commons": {
"version": "0.1.6", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz", "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.2.0.tgz",
"dependencies": { "dependencies": {
"crc32-stream": { "crc32-stream": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.1.tgz" "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.1.tgz"
},
"node-int64": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz"
} }
} }
} }
...@@ -590,8 +574,8 @@ ...@@ -590,8 +574,8 @@
} }
}, },
"source-map": { "source-map": {
"version": "0.1.41", "version": "0.1.43",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.41.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"dependencies": { "dependencies": {
"amdefine": { "amdefine": {
"version": "0.1.0", "version": "0.1.0",
...@@ -610,24 +594,24 @@ ...@@ -610,24 +594,24 @@
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
}, },
"connect": { "connect": {
"version": "2.27.6", "version": "2.28.1",
"resolved": "https://registry.npmjs.org/connect/-/connect-2.27.6.tgz", "resolved": "https://registry.npmjs.org/connect/-/connect-2.28.1.tgz",
"dependencies": { "dependencies": {
"basic-auth-connect": { "basic-auth-connect": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz" "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"
}, },
"body-parser": { "body-parser": {
"version": "1.9.3", "version": "1.10.1",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.9.3.tgz", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.10.1.tgz",
"dependencies": { "dependencies": {
"iconv-lite": { "iconv-lite": {
"version": "0.4.5", "version": "0.4.5",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz" "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz"
}, },
"on-finished": { "on-finished": {
"version": "2.1.1", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz",
"dependencies": { "dependencies": {
"ee-first": { "ee-first": {
"version": "1.1.0", "version": "1.1.0",
...@@ -646,26 +630,26 @@ ...@@ -646,26 +630,26 @@
"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz" "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
}, },
"compression": { "compression": {
"version": "1.2.2", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/compression/-/compression-1.2.2.tgz", "resolved": "https://registry.npmjs.org/compression/-/compression-1.3.0.tgz",
"dependencies": { "dependencies": {
"accepts": { "accepts": {
"version": "1.1.4", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.2.tgz",
"dependencies": { "dependencies": {
"mime-types": { "mime-types": {
"version": "2.0.4", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.4.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
"version": "1.3.1", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.3.1.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz"
} }
} }
}, },
"negotiator": { "negotiator": {
"version": "0.4.9", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz" "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.0.tgz"
} }
} }
}, },
...@@ -674,8 +658,8 @@ ...@@ -674,8 +658,8 @@
"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.1.tgz", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.1.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
"version": "1.4.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.4.0.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz"
} }
} }
}, },
...@@ -686,12 +670,12 @@ ...@@ -686,12 +670,12 @@
} }
}, },
"connect-timeout": { "connect-timeout": {
"version": "1.4.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.4.0.tgz", "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.5.0.tgz",
"dependencies": { "dependencies": {
"ms": { "ms": {
"version": "0.6.2", "version": "0.7.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
} }
} }
}, },
...@@ -708,46 +692,32 @@ ...@@ -708,46 +692,32 @@
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz" "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"
}, },
"csurf": { "csurf": {
"version": "1.6.3", "version": "1.6.5",
"resolved": "https://registry.npmjs.org/csurf/-/csurf-1.6.3.tgz", "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.6.5.tgz",
"dependencies": { "dependencies": {
"csrf": { "csrf": {
"version": "2.0.2", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/csrf/-/csrf-2.0.2.tgz", "resolved": "https://registry.npmjs.org/csrf/-/csrf-2.0.4.tgz",
"dependencies": { "dependencies": {
"base64-url": { "base64-url": {
"version": "1.0.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.0.0.tgz" "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.1.0.tgz"
}, },
"rndm": { "rndm": {
"version": "1.0.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/rndm/-/rndm-1.0.0.tgz" "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz"
}, },
"scmp": { "scmp": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz" "resolved": "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"
}, },
"uid-safe": { "uid-safe": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz", "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-1.0.2.tgz",
"dependencies": {
"mz": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/mz/-/mz-1.2.1.tgz",
"dependencies": { "dependencies": {
"native-or-bluebird": { "native-or-bluebird": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz" "resolved": "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"
},
"thenify": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/thenify/-/thenify-3.0.0.tgz"
},
"thenify-all": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.4.0.tgz"
}
}
} }
} }
} }
...@@ -756,8 +726,8 @@ ...@@ -756,8 +726,8 @@
} }
}, },
"debug": { "debug": {
"version": "2.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.1.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.1.1.tgz",
"dependencies": { "dependencies": {
"ms": { "ms": {
"version": "0.6.2", "version": "0.6.2",
...@@ -770,26 +740,26 @@ ...@@ -770,26 +740,26 @@
"resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz" "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
}, },
"errorhandler": { "errorhandler": {
"version": "1.2.3", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.2.3.tgz", "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.3.2.tgz",
"dependencies": { "dependencies": {
"accepts": { "accepts": {
"version": "1.1.4", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.2.tgz",
"dependencies": { "dependencies": {
"mime-types": { "mime-types": {
"version": "2.0.4", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.4.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
"version": "1.3.1", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.3.1.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz"
} }
} }
}, },
"negotiator": { "negotiator": {
"version": "0.4.9", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz" "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.0.tgz"
} }
} }
}, },
...@@ -800,54 +770,40 @@ ...@@ -800,54 +770,40 @@
} }
}, },
"express-session": { "express-session": {
"version": "1.9.3", "version": "1.10.1",
"resolved": "https://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz", "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.10.1.tgz",
"dependencies": { "dependencies": {
"crc": { "crc": {
"version": "3.2.1", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz" "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"
}, },
"uid-safe": { "uid-safe": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz", "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-1.0.2.tgz",
"dependencies": { "dependencies": {
"base64-url": { "base64-url": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.1.0.tgz" "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.1.0.tgz"
}, },
"mz": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/mz/-/mz-1.2.1.tgz",
"dependencies": {
"native-or-bluebird": { "native-or-bluebird": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz" "resolved": "https://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"
},
"thenify": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/thenify/-/thenify-3.0.0.tgz"
},
"thenify-all": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.4.0.tgz"
}
}
} }
} }
} }
} }
}, },
"finalhandler": { "finalhandler": {
"version": "0.3.2", "version": "0.3.3",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.2.tgz", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz",
"dependencies": { "dependencies": {
"escape-html": { "escape-html": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz" "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
}, },
"on-finished": { "on-finished": {
"version": "2.1.1", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz",
"dependencies": { "dependencies": {
"ee-first": { "ee-first": {
"version": "1.1.0", "version": "1.1.0",
...@@ -880,12 +836,12 @@ ...@@ -880,12 +836,12 @@
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
}, },
"method-override": { "method-override": {
"version": "2.3.0", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.0.tgz", "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.1.tgz",
"dependencies": { "dependencies": {
"methods": { "methods": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz" "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.1.tgz"
}, },
"vary": { "vary": {
"version": "1.0.0", "version": "1.0.0",
...@@ -894,16 +850,16 @@ ...@@ -894,16 +850,16 @@
} }
}, },
"morgan": { "morgan": {
"version": "1.4.1", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/morgan/-/morgan-1.4.1.tgz", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.5.1.tgz",
"dependencies": { "dependencies": {
"basic-auth": { "basic-auth": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz" "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz"
}, },
"on-finished": { "on-finished": {
"version": "2.1.1", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz",
"dependencies": { "dependencies": {
"ee-first": { "ee-first": {
"version": "1.1.0", "version": "1.1.0",
...@@ -966,8 +922,8 @@ ...@@ -966,8 +922,8 @@
"resolved": "https://registry.npmjs.org/response-time/-/response-time-2.2.0.tgz" "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.2.0.tgz"
}, },
"serve-favicon": { "serve-favicon": {
"version": "2.1.7", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz", "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz",
"dependencies": { "dependencies": {
"etag": { "etag": {
"version": "1.5.1", "version": "1.5.1",
...@@ -980,52 +936,52 @@ ...@@ -980,52 +936,52 @@
} }
}, },
"ms": { "ms": {
"version": "0.6.2", "version": "0.7.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
} }
} }
}, },
"serve-index": { "serve-index": {
"version": "1.5.3", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.5.3.tgz", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.6.0.tgz",
"dependencies": { "dependencies": {
"accepts": { "accepts": {
"version": "1.1.4", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.2.tgz",
"dependencies": { "dependencies": {
"negotiator": { "negotiator": {
"version": "0.4.9", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz" "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.0.tgz"
} }
} }
}, },
"batch": { "batch": {
"version": "0.5.1", "version": "0.5.2",
"resolved": "https://registry.npmjs.org/batch/-/batch-0.5.1.tgz" "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.2.tgz"
}, },
"mime-types": { "mime-types": {
"version": "2.0.4", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.4.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
"version": "1.3.1", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.3.1.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz"
} }
} }
} }
} }
}, },
"serve-static": { "serve-static": {
"version": "1.7.1", "version": "1.8.0",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.7.1.tgz", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.8.0.tgz",
"dependencies": { "dependencies": {
"escape-html": { "escape-html": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz" "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"
}, },
"send": { "send": {
"version": "0.10.1", "version": "0.11.0",
"resolved": "https://registry.npmjs.org/send/-/send-0.10.1.tgz", "resolved": "https://registry.npmjs.org/send/-/send-0.11.0.tgz",
"dependencies": { "dependencies": {
"destroy": { "destroy": {
"version": "1.0.3", "version": "1.0.3",
...@@ -1046,12 +1002,12 @@ ...@@ -1046,12 +1002,12 @@
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
}, },
"ms": { "ms": {
"version": "0.6.2", "version": "0.7.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"
}, },
"on-finished": { "on-finished": {
"version": "2.1.1", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz",
"dependencies": { "dependencies": {
"ee-first": { "ee-first": {
"version": "1.1.0", "version": "1.1.0",
...@@ -1068,16 +1024,16 @@ ...@@ -1068,16 +1024,16 @@
} }
}, },
"type-is": { "type-is": {
"version": "1.5.4", "version": "1.5.5",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.5.4.tgz", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.5.5.tgz",
"dependencies": { "dependencies": {
"mime-types": { "mime-types": {
"version": "2.0.4", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.4.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz",
"dependencies": { "dependencies": {
"mime-db": { "mime-db": {
"version": "1.3.1", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.3.1.tgz" "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz"
} }
} }
} }
...@@ -1158,8 +1114,8 @@ ...@@ -1158,8 +1114,8 @@
} }
}, },
"grunt-contrib-csslint": { "grunt-contrib-csslint": {
"version": "0.3.1", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-csslint/-/grunt-contrib-csslint-0.3.1.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-csslint/-/grunt-contrib-csslint-0.4.0.tgz",
"dependencies": { "dependencies": {
"chalk": { "chalk": {
"version": "0.5.1", "version": "0.5.1",
...@@ -1212,6 +1168,10 @@ ...@@ -1212,6 +1168,10 @@
"lodash": { "lodash": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz" "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
},
"strip-json-comments": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"
} }
} }
}, },
...@@ -1258,16 +1218,16 @@ ...@@ -1258,16 +1218,16 @@
} }
}, },
"clean-css": { "clean-css": {
"version": "3.0.1", "version": "3.0.5",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.0.1.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.0.5.tgz",
"dependencies": { "dependencies": {
"commander": { "commander": {
"version": "2.5.1", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.5.1.tgz" "resolved": "https://registry.npmjs.org/commander/-/commander-2.5.1.tgz"
}, },
"source-map": { "source-map": {
"version": "0.1.41", "version": "0.1.43",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.41.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"dependencies": { "dependencies": {
"amdefine": { "amdefine": {
"version": "0.1.0", "version": "0.1.0",
...@@ -1406,12 +1366,12 @@ ...@@ -1406,12 +1366,12 @@
"resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz", "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz",
"dependencies": { "dependencies": {
"acorn-globals": { "acorn-globals": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.1.tgz", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.2.tgz",
"dependencies": { "dependencies": {
"acorn": { "acorn": {
"version": "0.8.0", "version": "0.11.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz" "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.11.0.tgz"
} }
} }
} }
...@@ -1470,8 +1430,8 @@ ...@@ -1470,8 +1430,8 @@
} }
}, },
"source-map": { "source-map": {
"version": "0.1.41", "version": "0.1.43",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.41.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"dependencies": { "dependencies": {
"amdefine": { "amdefine": {
"version": "0.1.0", "version": "0.1.0",
...@@ -1496,12 +1456,12 @@ ...@@ -1496,12 +1456,12 @@
"resolved": "https://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz" "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz"
}, },
"acorn-globals": { "acorn-globals": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.1.tgz", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.2.tgz",
"dependencies": { "dependencies": {
"acorn": { "acorn": {
"version": "0.8.0", "version": "0.11.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz" "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.11.0.tgz"
} }
} }
} }
...@@ -1642,12 +1602,12 @@ ...@@ -1642,12 +1602,12 @@
} }
}, },
"grunt-contrib-less": { "grunt-contrib-less": {
"version": "0.12.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.12.0.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.0.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "0.2.10", "version": "0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
}, },
"chalk": { "chalk": {
"version": "0.5.1", "version": "0.5.1",
...@@ -1688,23 +1648,17 @@ ...@@ -1688,23 +1648,17 @@
} }
}, },
"less": { "less": {
"version": "1.7.5",
"resolved": "https://registry.npmjs.org/less/-/less-1.7.5.tgz",
"dependencies": {
"clean-css": {
"version": "2.2.22",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.22.tgz",
"dependencies": {
"commander": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.2.0.tgz" "resolved": "https://registry.npmjs.org/less/-/less-2.2.0.tgz",
} "dependencies": {
}
},
"graceful-fs": { "graceful-fs": {
"version": "3.0.5", "version": "3.0.5",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz" "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
}, },
"image-size": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz"
},
"mime": { "mime": {
"version": "1.2.11", "version": "1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
...@@ -1719,38 +1673,86 @@ ...@@ -1719,38 +1673,86 @@
} }
} }
}, },
"promise": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz",
"dependencies": {
"asap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"
}
}
},
"request": { "request": {
"version": "2.40.0", "version": "2.51.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz", "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
"dependencies": { "dependencies": {
"aws-sign2": { "aws-sign2": {
"version": "0.5.0", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
}, },
"forever-agent": { "bl": {
"version": "0.5.2", "version": "0.9.3",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz" "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
},
"form-data": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": { "dependencies": {
"async": { "readable-stream": {
"version": "0.9.0", "version": "1.0.33",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
},
"combined-stream": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
"dependencies": { "dependencies": {
"delayed-stream": { "core-util-is": {
"version": "0.0.5", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
} },
} "inherits": {
} "version": "2.0.1",
} "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}, },
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
}
}
}
}
},
"caseless": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
},
"combined-stream": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
}
}
},
"forever-agent": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"form-data": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
"dependencies": {
"mime-types": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz",
"dependencies": {
"mime-db": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz"
}
}
}
}
},
"hawk": { "hawk": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz", "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
...@@ -1774,20 +1776,20 @@ ...@@ -1774,20 +1776,20 @@
} }
}, },
"http-signature": { "http-signature": {
"version": "0.10.0", "version": "0.10.1",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
"dependencies": { "dependencies": {
"asn1": { "asn1": {
"version": "0.1.11", "version": "0.1.11",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
}, },
"assert-plus": { "assert-plus": {
"version": "0.1.2", "version": "0.1.5",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
}, },
"ctype": { "ctype": {
"version": "0.5.2", "version": "0.5.3",
"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
} }
} }
}, },
...@@ -1804,12 +1806,12 @@ ...@@ -1804,12 +1806,12 @@
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz" "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
}, },
"oauth-sign": { "oauth-sign": {
"version": "0.3.0", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz" "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
}, },
"qs": { "qs": {
"version": "1.0.2", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz" "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
}, },
"stringstream": { "stringstream": {
"version": "0.0.4", "version": "0.0.4",
...@@ -1832,8 +1834,8 @@ ...@@ -1832,8 +1834,8 @@
} }
}, },
"source-map": { "source-map": {
"version": "0.1.41", "version": "0.1.43",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.41.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"dependencies": { "dependencies": {
"amdefine": { "amdefine": {
"version": "0.1.0", "version": "0.1.0",
...@@ -1846,96 +1848,6 @@ ...@@ -1846,96 +1848,6 @@
"lodash": { "lodash": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz" "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
},
"maxmin": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/maxmin/-/maxmin-0.1.0.tgz",
"dependencies": {
"chalk": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
"dependencies": {
"ansi-styles": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"
},
"has-color": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"
},
"strip-ansi": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"
}
}
},
"gzip-size": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-0.1.1.tgz",
"dependencies": {
"concat-stream": {
"version": "1.4.7",
"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz",
"dependencies": {
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"readable-stream": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
"dependencies": {
"core-util-is": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
},
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
}
}
},
"typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
}
}
},
"zlib-browserify": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz",
"dependencies": {
"tape": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/tape/-/tape-0.2.2.tgz",
"dependencies": {
"deep-equal": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"
},
"defined": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
},
"jsonify": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
}
}
}
}
}
}
},
"pretty-bytes": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.2.tgz"
}
}
} }
} }
}, },
...@@ -1943,178 +1855,6 @@ ...@@ -1943,178 +1855,6 @@
"version": "0.5.2", "version": "0.5.2",
"resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.5.2.tgz", "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.5.2.tgz",
"dependencies": { "dependencies": {
"grunt": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
"dependencies": {
"async": {
"version": "0.1.22",
"resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
},
"coffee-script": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
},
"colors": {
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
},
"dateformat": {
"version": "1.0.2-1.2.3",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"
},
"eventemitter2": {
"version": "0.4.14",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
},
"exit": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
},
"findup-sync": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
"dependencies": {
"glob": {
"version": "3.2.11",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
"dependencies": {
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"minimatch": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
"dependencies": {
"lru-cache": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
},
"sigmund": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
}
}
}
}
},
"lodash": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
}
}
},
"getobject": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
},
"glob": {
"version": "3.1.21",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
"dependencies": {
"graceful-fs": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
},
"inherits": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
}
}
},
"grunt-legacy-log": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz",
"dependencies": {
"lodash": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
},
"underscore.string": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
}
}
},
"grunt-legacy-util": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"
},
"hooker": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
},
"iconv-lite": {
"version": "0.2.11",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
},
"js-yaml": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz",
"dependencies": {
"argparse": {
"version": "0.1.16",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
"dependencies": {
"underscore": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
},
"underscore.string": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
}
}
},
"esprima": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
}
}
},
"lodash": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
},
"minimatch": {
"version": "0.2.14",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
"dependencies": {
"lru-cache": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
},
"sigmund": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
}
}
},
"nopt": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
"dependencies": {
"abbrev": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
}
}
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
},
"underscore.string": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
},
"which": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/which/-/which-1.0.8.tgz"
}
}
},
"grunt-lib-phantomjs": { "grunt-lib-phantomjs": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-0.6.0.tgz", "resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-0.6.0.tgz",
...@@ -2300,20 +2040,20 @@ ...@@ -2300,20 +2040,20 @@
} }
}, },
"http-signature": { "http-signature": {
"version": "0.10.0", "version": "0.10.1",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
"dependencies": { "dependencies": {
"asn1": { "asn1": {
"version": "0.1.11", "version": "0.1.11",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
}, },
"assert-plus": { "assert-plus": {
"version": "0.1.2", "version": "0.1.5",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
}, },
"ctype": { "ctype": {
"version": "0.5.2", "version": "0.5.3",
"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
} }
} }
}, },
...@@ -2487,186 +2227,84 @@ ...@@ -2487,186 +2227,84 @@
"version": "0.10.31", "version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
} }
} }
},
"typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
}
}
}
}
},
"pretty-bytes": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.2.tgz",
"dependencies": {
"get-stdin": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-1.0.0.tgz"
}
}
}
}
},
"uglify-js": {
"version": "2.4.16",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz",
"dependencies": {
"async": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
},
"optimist": {
"version": "0.3.7",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
}
}
},
"source-map": {
"version": "0.1.34",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
"dependencies": {
"amdefine": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
}
}
},
"uglify-to-browserify": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
}
}
},
"uri-path": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz"
}
}
},
"grunt-contrib-watch": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-0.6.1.tgz",
"dependencies": {
"async": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
},
"gaze": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
"dependencies": {
"globule": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
"dependencies": {
"glob": {
"version": "3.1.21",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
"dependencies": {
"graceful-fs": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
},
"inherits": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
}
}
},
"lodash": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
},
"minimatch": {
"version": "0.2.14",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
"dependencies": {
"lru-cache": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
},
"sigmund": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
}
}
}
}
}
}
},
"grunt": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
"dependencies": {
"async": {
"version": "0.1.22",
"resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
},
"coffee-script": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
},
"colors": {
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
},
"dateformat": {
"version": "1.0.2-1.2.3",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"
},
"eventemitter2": {
"version": "0.4.14",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
}, },
"exit": { "typedarray": {
"version": "0.1.2", "version": "0.0.6",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
}
}
}
}
}, },
"findup-sync": { "pretty-bytes": {
"version": "0.1.3", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.2.tgz",
"dependencies": { "dependencies": {
"glob": { "get-stdin": {
"version": "3.2.11", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-1.0.0.tgz"
}
}
}
}
},
"uglify-js": {
"version": "2.4.16",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz",
"dependencies": { "dependencies": {
"inherits": { "async": {
"version": "2.0.1", "version": "0.2.10",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
}, },
"minimatch": { "optimist": {
"version": "0.3.0", "version": "0.3.7",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
"dependencies": { "dependencies": {
"lru-cache": { "wordwrap": {
"version": "2.5.0", "version": "0.0.2",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
}
}
}, },
"sigmund": { "source-map": {
"version": "1.0.0", "version": "0.1.34",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
"dependencies": {
"amdefine": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
} }
} }
},
"uglify-to-browserify": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
} }
} }
}, },
"lodash": { "uri-path": {
"version": "2.4.1", "version": "0.0.2",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz" "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz"
} }
} }
}, },
"getobject": { "grunt-contrib-watch": {
"version": "0.1.0", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz" "resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-0.6.1.tgz",
"dependencies": {
"async": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
}, },
"gaze": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
"dependencies": {
"globule": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
"dependencies": {
"glob": { "glob": {
"version": "3.1.21", "version": "3.1.21",
"resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
...@@ -2681,59 +2319,9 @@ ...@@ -2681,59 +2319,9 @@
} }
} }
}, },
"grunt-legacy-log": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz",
"dependencies": {
"lodash": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
},
"underscore.string": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
}
}
},
"grunt-legacy-util": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"
},
"hooker": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
},
"iconv-lite": {
"version": "0.2.11",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
},
"js-yaml": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz",
"dependencies": {
"argparse": {
"version": "0.1.16",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
"dependencies": {
"underscore": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
},
"underscore.string": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
}
}
},
"esprima": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
}
}
},
"lodash": { "lodash": {
"version": "0.9.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz" "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz"
}, },
"minimatch": { "minimatch": {
"version": "0.2.14", "version": "0.2.14",
...@@ -2748,28 +2336,8 @@ ...@@ -2748,28 +2336,8 @@
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
} }
} }
},
"nopt": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
"dependencies": {
"abbrev": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
} }
} }
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
},
"underscore.string": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
},
"which": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/which/-/which-1.0.8.tgz"
} }
} }
}, },
...@@ -2869,10 +2437,6 @@ ...@@ -2869,10 +2437,6 @@
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz" "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"
}, },
"vow": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz"
},
"vow-queue": { "vow-queue": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.3.1.tgz" "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.3.1.tgz"
...@@ -2960,20 +2524,20 @@ ...@@ -2960,20 +2524,20 @@
} }
}, },
"http-signature": { "http-signature": {
"version": "0.10.0", "version": "0.10.1",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
"dependencies": { "dependencies": {
"asn1": { "asn1": {
"version": "0.1.11", "version": "0.1.11",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
}, },
"assert-plus": { "assert-plus": {
"version": "0.1.2", "version": "0.1.5",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
}, },
"ctype": { "ctype": {
"version": "0.5.2", "version": "0.5.3",
"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
} }
} }
}, },
...@@ -3168,16 +2732,16 @@ ...@@ -3168,16 +2732,16 @@
} }
}, },
"grunt-jscs": { "grunt-jscs": {
"version": "1.1.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.1.0.tgz", "resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-1.2.0.tgz",
"dependencies": { "dependencies": {
"hooker": { "hooker": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
}, },
"jscs": { "jscs": {
"version": "1.9.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/jscs/-/jscs-1.9.0.tgz", "resolved": "https://registry.npmjs.org/jscs/-/jscs-1.10.0.tgz",
"dependencies": { "dependencies": {
"colors": { "colors": {
"version": "1.0.3", "version": "1.0.3",
...@@ -3188,16 +2752,16 @@ ...@@ -3188,16 +2752,16 @@
"resolved": "https://registry.npmjs.org/commander/-/commander-2.5.1.tgz" "resolved": "https://registry.npmjs.org/commander/-/commander-2.5.1.tgz"
}, },
"esprima": { "esprima": {
"version": "1.2.2", "version": "1.2.3",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz" "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.3.tgz"
}, },
"esprima-harmony-jscs": { "esprima-harmony-jscs": {
"version": "1.1.0-dev-harmony", "version": "1.1.0-regex-token-fix",
"resolved": "https://registry.npmjs.org/esprima-harmony-jscs/-/esprima-harmony-jscs-1.1.0-dev-harmony.tgz" "resolved": "https://registry.npmjs.org/esprima-harmony-jscs/-/esprima-harmony-jscs-1.1.0-regex-token-fix.tgz"
}, },
"estraverse": { "estraverse": {
"version": "1.8.0", "version": "1.9.1",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz" "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.1.tgz"
}, },
"exit": { "exit": {
"version": "0.1.2", "version": "0.1.2",
...@@ -3215,6 +2779,20 @@ ...@@ -3215,6 +2779,20 @@
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}, },
"minimatch": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
"dependencies": {
"lru-cache": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
},
"sigmund": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
}
}
},
"once": { "once": {
"version": "1.3.1", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
...@@ -3228,22 +2806,24 @@ ...@@ -3228,22 +2806,24 @@
} }
}, },
"minimatch": { "minimatch": {
"version": "1.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
"dependencies": { "dependencies": {
"lru-cache": { "brace-expansion": {
"version": "2.5.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz" "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
"dependencies": {
"balanced-match": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
}, },
"sigmund": { "concat-map": {
"version": "1.0.0", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
}
}
} }
} }
},
"regenerate": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.0.1.tgz"
}, },
"strip-json-comments": { "strip-json-comments": {
"version": "1.0.2", "version": "1.0.2",
...@@ -3253,17 +2833,13 @@ ...@@ -3253,17 +2833,13 @@
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz" "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz"
}, },
"unicode-6.3.0": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/unicode-6.3.0/-/unicode-6.3.0-0.1.5.tgz"
},
"vow-fs": { "vow-fs": {
"version": "0.3.4", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz", "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz",
"dependencies": { "dependencies": {
"glob": { "glob": {
"version": "4.3.2", "version": "4.3.5",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.3.2.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
"dependencies": { "dependencies": {
"inflight": { "inflight": {
"version": "1.0.4", "version": "1.0.4",
...@@ -3279,26 +2855,6 @@ ...@@ -3279,26 +2855,6 @@
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}, },
"minimatch": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
"dependencies": {
"brace-expansion": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
"dependencies": {
"balanced-match": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
}
}
}
}
},
"once": { "once": {
"version": "1.3.1", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
...@@ -3414,20 +2970,20 @@ ...@@ -3414,20 +2970,20 @@
} }
}, },
"http-signature": { "http-signature": {
"version": "0.10.0", "version": "0.10.1",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
"dependencies": { "dependencies": {
"asn1": { "asn1": {
"version": "0.1.11", "version": "0.1.11",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
}, },
"assert-plus": { "assert-plus": {
"version": "0.1.2", "version": "0.1.5",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz" "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
}, },
"ctype": { "ctype": {
"version": "0.5.2", "version": "0.5.3",
"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz" "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
} }
} }
}, },
...@@ -4040,8 +3596,8 @@ ...@@ -4040,8 +3596,8 @@
} }
}, },
"npm": { "npm": {
"version": "2.1.16", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/npm/-/npm-2.1.16.tgz", "resolved": "https://registry.npmjs.org/npm/-/npm-2.2.0.tgz",
"dependencies": { "dependencies": {
"abbrev": { "abbrev": {
"version": "1.0.5", "version": "1.0.5",
...@@ -4178,8 +3734,8 @@ ...@@ -4178,8 +3734,8 @@
"resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz" "resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz"
}, },
"glob": { "glob": {
"version": "4.3.1", "version": "4.3.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz" "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.2.tgz"
}, },
"graceful-fs": { "graceful-fs": {
"version": "3.0.5", "version": "3.0.5",
...@@ -4265,6 +3821,10 @@ ...@@ -4265,6 +3821,10 @@
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz" "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"
}, },
"normalize-git-url": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-1.0.0.tgz"
},
"normalize-package-data": { "normalize-package-data": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz" "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz"
...@@ -4274,8 +3834,8 @@ ...@@ -4274,8 +3834,8 @@
"resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz" "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"
}, },
"npm-install-checks": { "npm-install-checks": {
"version": "1.0.4", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.4.tgz" "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.5.tgz"
}, },
"npm-package-arg": { "npm-package-arg": {
"version": "2.1.3", "version": "2.1.3",
...@@ -4532,8 +4092,8 @@ ...@@ -4532,8 +4092,8 @@
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}, },
"semver": { "semver": {
"version": "4.1.1", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-4.1.1.tgz" "resolved": "https://registry.npmjs.org/semver/-/semver-4.2.0.tgz"
}, },
"sha": { "sha": {
"version": "1.3.0", "version": "1.3.0",
...@@ -4652,8 +4212,8 @@ ...@@ -4652,8 +4212,8 @@
} }
}, },
"autolinker": { "autolinker": {
"version": "0.15.0", "version": "0.15.2",
"resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.15.0.tgz" "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.15.2.tgz"
} }
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment