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

Conflicts:
	dist/css/bootstrap.min.css

Gruntfile.js

@@ -63,7 +63,8 @@ module.exports = function(grunt) {
 
     uglify: {
       options: {
-        banner: '<%= banner %>'
+        banner: '<%= banner %>',
+        report: 'min'
       },
       bootstrap: {
         src: ['<%= concat.bootstrap.dest %>'],
@@ -217,4 +218,4 @@ module.exports = function(grunt) {
     var files = getFiles('js') + getFiles('less') + getFiles('fonts')
     fs.writeFileSync('assets/js/raw-files.js', files)
   });
-};
+};
\ No newline at end of file

assets/js/jszip.js

@@ -659,7 +659,7 @@ JSZip.prototype = (function () {
             if ( !this.files.hasOwnProperty(name) ) { continue; }
             var file = this.files[name];
 
-            var compressionName = file.compression || options.compression.toUpperCase();
+            var compressionName = file.options.compression || options.compression.toUpperCase();
             var compression = JSZip.compressions[compressionName];
             if (!compression) {
                throw new Error(compressionName + " is not a valid compression method !");
@@ -1422,4 +1422,4 @@ JSZip.base64 = (function() {
 }());
 
 // enforcing Stuk's coding style
-// vim: set shiftwidth=3 softtabstop=3:
+// vim: set shiftwidth=3 softtabstop=3:
\ No newline at end of file

components.html

@@ -2102,7 +2102,7 @@ body { padding-bottom: 70px; }
     <div class="page-header">
       <h1 id="jumbotron">Jumbotron</h1>
     </div>
-    <p>A lightweight, flexible component that can optional extend the entire viewport to showcase key content on your site. To make the jumbotron full width, don't include it within a <code>.container</code>. Placing it within a container will keep it at the width of the rest of your content and provide rounded corners.</p>
+    <p>A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site. To make the jumbotron full width, don't include it within a <code>.container</code>. Placing it within a container will keep it at the width of the rest of your content and provide rounded corners.</p>
     <div class="bs-example">
       <div class="jumbotron">
         <div class="container">

css.html

@@ -45,7 +45,7 @@ base_url: "../"
     <p>Bootstrap sets basic global display, typography, and link styles. Specifically, we:</p>
     <ul>
       <li>Remove <code>margin</code> on the body</li>
-      <li>Set <code>background-color: white;</code> on the <code>body</code></li>
+      <li>Set <code>background-color: #fff;</code> on the <code>body</code></li>
       <li>Use the <code>@font-family-base</code>, <code>@font-size-base</code>, and <code>@line-height-base</code> attributes as our typographic base</li>
       <li>Set the global link color via <code>@link-color</code> and apply link underlines only on <code>:hover</code></li>
     </ul>

dist/css/bootstrap.css

-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
 
 article,
 aside,
@@ -26,7 +26,8 @@ audio:not([controls]) {
   height: 0;
 }
 
-[hidden] {
+[hidden],
+template {
   display: none;
 }
 
@@ -40,6 +41,10 @@ body {
   margin: 0;
 }
 
+a {
+  background: transparent;
+}
+
 a:focus {
   outline: thin dotted;
 }
@@ -3950,7 +3955,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 
 .nav-pills > li > a {
-  border-radius: 5px;
+  border-radius: 4px;
 }
 
 .nav-pills > li + li {

getting-started.html

@@ -445,11 +445,34 @@ bootstrap/
             <td><code>.bar-*</code></td>
             <td><code>.progress-bar-*</code></td>
           </tr>
+          <tr>
+            <td><code>.accordion</code></td>
+            <td><code>.panel-group</code></td>
+          </tr>
+          <tr>
+            <td><code>.accordion-group</code></td>
+            <td><code>.panel .panel-default</code></td>
+          </tr>
+          <tr>
+            <td><code>.accordion-heading</code></td>
+            <td><code>.panel-heading</code></td>
+          </tr>
+          <tr>
+            <td><code>.accordion-body</code></td>
+            <td><code>.panel-collapse</code></td>
+          </tr>
+          <tr>
+            <td><code>.accordion-inner</code></td>
+            <td><code>.panel-body</code></td>
+          </tr>
+          <tr>
+            <td><code>.alert-error</code></td>
+            <td><code>.alert-danger</code></td>
+          </tr>
         </tbody>
       </table>
     </div><!-- /.table-responsive -->
 
-
     <h2 id="migration-new">What's new</h2>
     <p>We've added new elements and changed some existing ones. Here are the new or updated styles.</p>
     <div class="table-responsive">

javascript.html

@@ -750,10 +750,10 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed)
     </p>
 {% highlight html %}
 <ul class="nav nav-tabs" id="myTab">
-  <li class="active"><a href="#home">Home</a></li>
-  <li><a href="#profile">Profile</a></li>
-  <li><a href="#messages">Messages</a></li>
-  <li><a href="#settings">Settings</a></li>
+  <li class="active"><a href="#home" data-toggle="tab">Home</a></li>
+  <li><a href="#profile" data-toggle="tab">Profile</a></li>
+  <li><a href="#messages" data-toggle="tab">Messages</a></li>
+  <li><a href="#settings" data-toggle="tab">Settings</a></li>
 </ul>
 
 <div class="tab-content">
@@ -1456,7 +1456,7 @@ $('.btn-group').button()
         <div class="panel panel-default">
           <div class="panel-heading">
             <h4 class="panel-title">
-              <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+              <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
                 Collapsible Group Item #1
               </a>
             </h4>
@@ -1470,7 +1470,7 @@ $('.btn-group').button()
         <div class="panel panel-default">
           <div class="panel-heading">
             <h4 class="panel-title">
-              <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
+              <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
                 Collapsible Group Item #2
               </a>
             </h4>
@@ -1484,7 +1484,7 @@ $('.btn-group').button()
         <div class="panel panel-default">
           <div class="panel-heading">
             <h4 class="panel-title">
-              <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+              <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
                 Collapsible Group Item #3
               </a>
             </h4>
@@ -1502,7 +1502,7 @@ $('.btn-group').button()
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+        <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
           Collapsible Group Item #1
         </a>
       </h4>
@@ -1516,7 +1516,7 @@ $('.btn-group').button()
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
+        <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
           Collapsible Group Item #2
         </a>
       </h4>
@@ -1530,7 +1530,7 @@ $('.btn-group').button()
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+        <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
           Collapsible Group Item #3
         </a>
       </h4>

js/.jshintrc

 {
-  "validthis": true,
-  "laxcomma" : true,
-  "laxbreak" : true,
+  "asi"      : true,
+  "boss"     : true,
   "browser"  : true,
-  "eqeqeq"   : false,
-  "eqnull"   : true,
+  "curly"    : false,
   "debug"    : true,
   "devel"    : true,
-  "curly"    : false,
-  "boss"     : true,
+  "eqeqeq"   : false,
+  "eqnull"   : true,
   "expr"     : true,
-  "asi"      : true
+  "laxbreak" : true,
+  "laxcomma" : true,
+  "validthis": true
 }
\ No newline at end of file

less/mixins.less

@@ -559,7 +559,7 @@
 }
 
 .responsive-invisibility() {
-	&,
+    &,
   tr&,
   th&,
   td& { display: none !important; }

less/navs.less

@@ -120,7 +120,7 @@
 
     // Links rendered as pills
     > a {
-      border-radius: 5px;
+      border-radius: @nav-pills-border-radius;
     }
     + li {
       margin-left: 2px;

less/normalize.less

-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
 
 // ==========================================================================
 // HTML5 display definitions
@@ -44,10 +44,12 @@ audio:not([controls]) {
 }
 
 //
-// Address styling not present in IE 8/9.
+// Address `[hidden]` styling not present in IE 8/9.
+// Hide the `template` element in IE, Safari, and Firefox < 22.
 //
 
-[hidden] {
+[hidden],
+template {
   display: none;
 }
 
@@ -63,8 +65,8 @@ audio:not([controls]) {
 
 html {
   font-family: sans-serif; // 1
-  -webkit-text-size-adjust: 100%; // 2
   -ms-text-size-adjust: 100%; // 2
+  -webkit-text-size-adjust: 100%; // 2
 }
 
 //
@@ -79,6 +81,14 @@ body {
 // Links
 // ==========================================================================
 
+//
+// Remove the gray background color from active links in IE 10.
+//
+
+a {
+  background: transparent;
+}
+
 //
 // Address `outline` inconsistency between Chrome and other browsers.
 //
@@ -329,8 +339,8 @@ html input[disabled] {
 }
 
 //
-// 1. Address box sizing set to `content-box` in IE 8/9.
-// 2. Remove excess padding in IE 8/9.
+// 1. Address box sizing set to `content-box` in IE 8/9/10.
+// 2. Remove excess padding in IE 8/9/10.
 //
 
 input[type="checkbox"],

less/variables.less

@@ -336,6 +336,7 @@
 @nav-tabs-justified-active-link-border-color:     @body-bg;
 
 // Pills
+@nav-pills-border-radius:                   @border-radius-base;
 @nav-pills-active-link-hover-bg:            @component-active-bg;
 @nav-pills-active-link-hover-color:         @component-active-color;
 

package.json

@@ -22,12 +22,12 @@
   , "devDependencies": {
       "grunt": "~0.4.1"
     , "grunt-contrib-clean": "~0.5.0"
-    , "grunt-contrib-connect": "~0.5.0"
     , "grunt-contrib-concat": "~0.3.0"
+    , "grunt-contrib-connect": "~0.5.0"
     , "grunt-contrib-copy": "~0.4.1"
     , "grunt-contrib-jshint": "~0.6.4"
-    , "grunt-contrib-uglify": "~0.2.4"
     , "grunt-contrib-qunit": "~0.2.2"
+    , "grunt-contrib-uglify": "~0.2.4"
     , "grunt-contrib-watch": "~0.5.3"
     , "grunt-html-validation": "~0.1.5"
     , "grunt-jekyll": "~0.3.9"