0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00

Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2014-06-25 16:57:22 -07:00
commit 4045740c54
36 changed files with 3598 additions and 3661 deletions

View File

@ -33,7 +33,7 @@ module.exports = function (grunt) {
' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
' */\n',
// NOTE: This jqueryCheck code is duplicated in customizer.js; if making changes here, be sure to update the other copy too.
jqueryCheck: 'if (typeof define == \'undefined\' && typeof exports == \'undefined\' && typeof jQuery == \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',
jqueryCheck: 'if (typeof jQuery === \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',
// Task configuration.
clean: {
@ -232,7 +232,8 @@ module.exports = function (grunt) {
cssmin: {
options: {
compatibility: 'ie8',
keepSpecialComments: '*'
keepSpecialComments: '*',
noAdvanced: true
},
core: {
files: {
@ -378,6 +379,7 @@ module.exports = function (grunt) {
options: {
build: process.env.TRAVIS_JOB_ID,
concurrency: 10,
maxRetries: 3,
urls: ['http://127.0.0.1:3000/js/tests/index.html'],
browsers: grunt.file.readYAML('grunt/sauce_browsers.yml')
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

147
dist/js/bootstrap.js vendored
View File

@ -4,7 +4,7 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQuery == 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
/* ========================================================================
* Bootstrap: transition.js v3.1.1
@ -15,12 +15,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
// ============================================================
@ -68,9 +64,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
}
})
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: alert.js v3.1.1
@ -81,12 +75,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// ALERT CLASS DEFINITION
// ======================
@ -167,9 +157,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: button.js v3.1.1
@ -180,12 +168,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// BUTTON PUBLIC CLASS DEFINITION
// ==============================
@ -284,9 +268,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
e.preventDefault()
})
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: carousel.js v3.1.1
@ -297,12 +279,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// CAROUSEL CLASS DEFINITION
// =========================
@ -493,6 +471,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
var href
var $this = $(this)
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
if (!$target.hasClass('carousel')) return
var options = $.extend({}, $target.data(), $this.data())
var slideIndex = $this.attr('data-slide-to')
if (slideIndex) options.interval = false
@ -513,9 +492,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
})
})
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: collapse.js v3.1.1
@ -526,12 +503,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// COLLAPSE PUBLIC CLASS DEFINITION
// ================================
@ -690,9 +663,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
Plugin.call($target, option)
})
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: dropdown.js v3.1.1
@ -703,12 +674,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// DROPDOWN CLASS DEFINITION
// =========================
@ -848,9 +815,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: modal.js v3.1.1
@ -861,12 +826,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// MODAL CLASS DEFINITION
// ======================
@ -1135,9 +1096,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
Plugin.call($target, option, this)
})
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: tooltip.js v3.1.1
@ -1149,12 +1108,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// TOOLTIP PUBLIC CLASS DEFINITION
// ===============================
@ -1599,9 +1554,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
return this
}
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: popover.js v3.1.1
@ -1612,12 +1565,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// POPOVER PUBLIC CLASS DEFINITION
// ===============================
@ -1719,9 +1668,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
return this
}
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: scrollspy.js v3.1.1
@ -1732,12 +1679,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// SCROLLSPY CLASS DEFINITION
// ==========================
@ -1896,9 +1839,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
})
})
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: tab.js v3.1.1
@ -1909,12 +1850,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// TAB CLASS DEFINITION
// ====================
@ -2031,9 +1968,7 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
Plugin.call($(this), 'show')
})
})
}();
}(jQuery);
/* ========================================================================
* Bootstrap: affix.js v3.1.1
@ -2044,12 +1979,8 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// AFFIX CLASS DEFINITION
// ======================
@ -2180,6 +2111,4 @@ if (typeof define == 'undefined' && typeof exports == 'undefined' && typeof jQue
})
})
})
}();
}(jQuery);

File diff suppressed because one or more lines are too long

View File

@ -347,10 +347,10 @@
<h3 id="grid-nesting">Nesting columns</h3>
<p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-md-*</code> columns within an existing <code>.col-md-*</code> 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).</p>
<p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-sm-*</code> columns within an existing <code>.col-sm-*</code> 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).</p>
<div class="row show-grid">
<div class="col-sm-9">
Level 1: .col-md-9
Level 1: .col-sm-9
<div class="row show-grid">
<div class="col-xs-8 col-sm-6">
Level 2: .col-xs-8 .col-sm-6

View File

@ -1,7 +1,7 @@
<div class="bs-docs-section">
<h1 id="examples" class="page-header">Examples</h1>
<p class="lead">Build on the basic template above with Bootstrap's many components. See also <a href="#customizing">Customizing Bootstrap</a> for tips on maintaining your own Bootstrap variants.</p>
<p class="lead">Build on the basic template above with Bootstrap's many components. We encourage you to customize and adapt Bootstrap to suit your individual project's needs.</p>
<h3 id="examples-framework">Using the framework</h3>
<div class="row bs-examples">

File diff suppressed because one or more lines are too long

View File

@ -306,7 +306,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
function generateJS(preamble) {
var $checked = $('#plugin-section input:checked')
var jqueryCheck = 'if (typeof define == \'undefined\' && typeof exports == \'undefined\' && typeof jQuery == \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n'
var jqueryCheck = 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap\'s JavaScript requires jQuery") }\n\n'
if (!$checked.length) return false

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -5,11 +5,10 @@
browserName: "safari",
platform: "OS X 10.9"
},
# {
# browserName: "chrome",
# platform: "OS X 10.9",
# version: "31"
# },
{
browserName: "chrome",
platform: "OS X 10.9"
},
{
browserName: "firefox",
platform: "OS X 10.9"
@ -27,16 +26,16 @@
version: "10",
platform: "Windows 8"
},
# {
# browserName: "internet explorer",
# version: "9",
# platform: "Windows 7"
# },
# {
# browserName: "internet explorer",
# version: "8",
# platform: "Windows 7"
# },
{
browserName: "internet explorer",
version: "9",
platform: "Windows 7"
},
{
browserName: "internet explorer",
version: "8",
platform: "Windows 7"
},
# { # Unofficial
# browserName: "internet explorer",

View File

@ -11,9 +11,10 @@
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
"disallowSpacesInsideArrayBrackets": true,
"disallowTrailingComma": true,
"disallowSpacesInsideParentheses": true,
"disallowTrailingComma": true,
"disallowTrailingWhitespace": true,
"requireCamelCaseOrUpperCaseIdentifiers": true,
"requireCapitalizedConstructors": true,
"requireCommaBeforeLineBreak": true,
"requireDotNotation": true,

View File

@ -11,6 +11,5 @@
"nonbsp" : true,
"strict" : true,
"undef" : true,
"unused" : true,
"predef" : [ "define", "require" ]
"unused" : true
}

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// AFFIX CLASS DEFINITION
// ======================
@ -143,6 +139,4 @@
})
})
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// ALERT CLASS DEFINITION
// ======================
@ -93,6 +89,4 @@
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// BUTTON PUBLIC CLASS DEFINITION
// ==============================
@ -111,6 +107,4 @@
e.preventDefault()
})
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// CAROUSEL CLASS DEFINITION
// =========================
@ -203,6 +199,7 @@
var href
var $this = $(this)
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
if (!$target.hasClass('carousel')) return
var options = $.extend({}, $target.data(), $this.data())
var slideIndex = $this.attr('data-slide-to')
if (slideIndex) options.interval = false
@ -223,6 +220,4 @@
})
})
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// COLLAPSE PUBLIC CLASS DEFINITION
// ================================
@ -171,6 +167,4 @@
Plugin.call($target, option)
})
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// DROPDOWN CLASS DEFINITION
// =========================
@ -152,6 +148,4 @@
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// MODAL CLASS DEFINITION
// ======================
@ -281,6 +277,4 @@
Plugin.call($target, option, this)
})
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// POPOVER PUBLIC CLASS DEFINITION
// ===============================
@ -114,6 +110,4 @@
return this
}
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// SCROLLSPY CLASS DEFINITION
// ==========================
@ -171,6 +167,4 @@
})
})
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// TAB CLASS DEFINITION
// ====================
@ -129,6 +125,4 @@
Plugin.call($(this), 'show')
})
})
}();
}(jQuery);

View File

@ -8,12 +8,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// TOOLTIP PUBLIC CLASS DEFINITION
// ===============================
@ -458,6 +454,4 @@
return this
}
})
}();
}(jQuery);

View File

@ -7,12 +7,8 @@
* ======================================================================== */
+function () { 'use strict';
(function (o_o) {
typeof define == 'function' && define.amd ? define(['jquery'], o_o) :
typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
})(function ($) {
+function ($) {
'use strict';
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
// ============================================================
@ -60,6 +56,4 @@
}
})
})
}();
}(jQuery);

View File

@ -6,6 +6,13 @@
// Bar animations
// -------------------------
// WebKit
@-webkit-keyframes progress-bar-stripes {
from { background-position: 40px 0; }
to { background-position: 0 0; }
}
// Spec and IE10+
@keyframes progress-bar-stripes {
from { background-position: 40px 0; }
to { background-position: 0 0; }

View File

@ -74,10 +74,10 @@ p {
// Emphasis & misc
// -------------------------
// Ex: 14px base font * 85% = about 12px
// Ex: (12px small font / 14px base font) * 100% = about 85%
small,
.small {
font-size: 85%;
font-size: floor((100% * @font-size-small / @font-size-base));
}
// Undo browser default styling

View File

@ -822,6 +822,8 @@
//
//##
//** Horizontal offset for forms and lists.
@component-offset-horizontal: 180px;
//** Text muted color
@text-muted: @gray-light;
//** Abbreviations and acronyms border color
@ -838,14 +840,7 @@
@page-header-border-color: @gray-lighter;
//** Width of horizontal description list titles
@dl-horizontal-offset: @component-offset-horizontal;
//== Miscellaneous
//
//##
//** Horizontal line color.
@hr-border: @gray-lighter;
//** Horizontal offset for forms and lists.
@component-offset-horizontal: 180px;

View File

@ -51,8 +51,8 @@
"grunt-exec": "~0.4.5",
"grunt-html-validation": "~0.1.18",
"grunt-jekyll": "~0.4.2",
"grunt-jscs-checker": "~0.5.1",
"grunt-saucelabs": "~8.0.2",
"grunt-jscs-checker": "~0.6.0",
"grunt-saucelabs": "~8.1.0",
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.6.0",
"markdown": "~0.5.0",

View File

@ -56,8 +56,8 @@
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"
},
"eventemitter2": {
"version": "0.4.13",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz"
"version": "0.4.14",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
},
"exit": {
"version": "0.1.2",
@ -230,8 +230,8 @@
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-1.3.1.tgz",
"dependencies": {
"caniuse-db": {
"version": "1.0.20140619",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140619.tgz"
"version": "1.0.20140622",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140622.tgz"
},
"fs-extra": {
"version": "0.9.1",
@ -700,8 +700,8 @@
}
},
"clean-css": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.2.tgz",
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.3.tgz",
"dependencies": {
"commander": {
"version": "2.2.0",
@ -1178,16 +1178,16 @@
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"form-data": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz",
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": {
"async": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
},
"combined-stream": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
@ -1368,12 +1368,12 @@
"resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-0.6.0.tgz",
"dependencies": {
"eventemitter2": {
"version": "0.4.13",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz"
"version": "0.4.14",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
},
"phantomjs": {
"version": "1.9.7-9",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-9.tgz",
"version": "1.9.7-10",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-10.tgz",
"dependencies": {
"adm-zip": {
"version": "0.2.1",
@ -1450,16 +1450,16 @@
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"form-data": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz",
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": {
"async": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
},
"combined-stream": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
@ -1886,16 +1886,16 @@
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"form-data": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz",
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": {
"async": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
},
"combined-stream": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
@ -2136,16 +2136,16 @@
}
},
"grunt-jscs-checker": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/grunt-jscs-checker/-/grunt-jscs-checker-0.5.1.tgz",
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/grunt-jscs-checker/-/grunt-jscs-checker-0.6.0.tgz",
"dependencies": {
"hooker": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
},
"jscs": {
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/jscs/-/jscs-1.5.3.tgz",
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/jscs/-/jscs-1.5.4.tgz",
"dependencies": {
"colors": {
"version": "0.6.2",
@ -2378,8 +2378,8 @@
}
},
"grunt-saucelabs": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/grunt-saucelabs/-/grunt-saucelabs-8.0.2.tgz",
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/grunt-saucelabs/-/grunt-saucelabs-8.1.0.tgz",
"dependencies": {
"colors": {
"version": "0.6.2",
@ -2406,16 +2406,16 @@
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"form-data": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz",
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": {
"async": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
},
"combined-stream": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
@ -2756,8 +2756,8 @@
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
},
"combined-stream": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
@ -3200,14 +3200,8 @@
"resolved": "https://registry.npmjs.org/editor/-/editor-0.1.0.tgz"
},
"fstream": {
"version": "0.1.27",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.27.tgz",
"dependencies": {
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
}
}
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz"
},
"fstream-npm": {
"version": "0.1.7",
@ -3215,7 +3209,31 @@
"dependencies": {
"fstream-ignore": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz"
"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz",
"dependencies": {
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
}
}
}
}
},
@ -3287,6 +3305,28 @@
"version": "0.13.1",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz",
"dependencies": {
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
},
"mkdirp": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
@ -3310,16 +3350,16 @@
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"form-data": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz",
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": {
"async": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
},
"combined-stream": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
@ -3408,6 +3448,38 @@
"semver": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-2.3.1.tgz"
},
"tar": {
"version": "0.1.20",
"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
"dependencies": {
"block-stream": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
},
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
},
"mkdirp": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
},
"rimraf": {
"version": "2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
}
}
},
@ -3450,16 +3522,16 @@
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"form-data": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz",
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": {
"async": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
},
"combined-stream": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
@ -3644,16 +3716,16 @@
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"form-data": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz",
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": {
"async": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
},
"combined-stream": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz",
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
@ -3784,8 +3856,14 @@
"resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"
},
"tar": {
"version": "0.1.19",
"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.19.tgz"
"version": "0.1.20",
"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
"dependencies": {
"fstream": {
"version": "0.1.28",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz"
}
}
},
"text-table": {
"version": "0.2.0",