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

Gruntfile.js

@@ -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')
         }

docs/_includes/css/grid.html

@@ -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

docs/_includes/getting-started/examples.html

 <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">

docs/assets/js/_src/customizer.js

@@ -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
 

grunt/sauce_browsers.yml

@@ -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",

js/.jscsrc

@@ -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,

js/.jshintrc

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

js/affix.js

@@ -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);

js/alert.js

@@ -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);

js/button.js

@@ -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);

js/carousel.js

@@ -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);

js/collapse.js

@@ -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);

js/dropdown.js

@@ -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);

js/modal.js

@@ -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);

js/popover.js

@@ -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);

js/scrollspy.js

@@ -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);

js/tab.js

@@ -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);

js/tooltip.js

@@ -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);

js/transition.js

@@ -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);

less/progress-bars.less

@@ -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; }

less/type.less

@@ -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

less/variables.less

@@ -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;
+

package.json

@@ -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",