Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Gruntfile.js

@@ -1,4 +1,6 @@
+/* jshint node: true */
 module.exports = function(grunt) {
+    "use strict";
 
     // Project configuration.
     grunt.initConfig({
@@ -26,6 +28,7 @@ module.exports = function(grunt) {
         },
         jshint: {
             options: {
+                ignores: [],// HACK: workaround https://github.com/gruntjs/grunt-contrib-jshint/issues/86
                 jshintrc: 'js/.jshintrc'
             },
             gruntfile: {

_config.yml

@@ -12,8 +12,8 @@ port:             9001
 
 # Custom vars
 repo:             https://github.com/twbs/bootstrap
-download:         https://github.com/twbs/bootstrap/archive/v3.0.0-rc1.zip
-download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.0.0-rc1/bs-v3.0.0-rc1-dist.zip
+download:         https://github.com/twbs/bootstrap/archive/3.0.0-wip.zip
+download_dist:    http://getbootstrap.com/bs-v3.0.0-rc1-dist.zip
 
 examples:         http://examples.getbootstrap.com
 examples_repo:    https://github.com/twbs/bootstrap-examples

_layouts/default.html

@@ -48,9 +48,6 @@
 
     </div>
 
-    <!-- Quick back to top -->
-    <a href="#" class="bs-top">Back to top</a>
-
     <!-- Footer
     ================================================== -->
     <footer class="bs-footer">

assets/css/docs.css

@@ -388,7 +388,6 @@ body {
 .bs-example-type .table td {
   color: #999;
   vertical-align: middle;
-  border-color: ;
 }
 .bs-example-type .table td,
 .bs-example-type .table th {
@@ -749,11 +748,6 @@ input.focused {
   margin-bottom: 5px;
 }
 
-/* Hide the top link initially */
-.bs-top {
-  display: none;
-}
-
 
 /* Responsive variations
 -------------------------------------------------- */
@@ -768,26 +762,6 @@ input.focused {
 /* Tablets and up */
 @media screen and (min-width: 768px) {
 
-  /* Back to top link */
-  .bs-top {
-    display: block; /* Unhide */
-    float: left;
-    padding: 7px 15px;
-    font-weight: 500;
-    color: #999;
-    background-color: #eee;
-    border-radius: 4px;
-  }
-  .bs-top:hover {
-    color: #fff;
-    text-decoration: none;
-    background-color: #999;
-  }
-  .bs-top.affix {
-    position: fixed;
-    right:  15px;
-    bottom: 15px;
-  }
   .bs-header {
     font-size: 21px;
     text-align: left;

assets/js/application.js

@@ -22,7 +22,7 @@
     $(document.body).on('click', '.bs-sidenav [href^=#]', function (e) {
       var $target = $(this.getAttribute('href'))
 
-      e.preventDefault() // prevent browser scroll
+      // e.preventDefault() // prevent browser scroll
 
       document.body.scrollTop =
         $target.offset().top -

css.html

@@ -29,6 +29,12 @@ base_url: "../"
     <p>To ensure proper rendering and touch zooming, <strong>add the viewport meta tag</strong> to your <code>&lt;head&gt;</code>.</p>
 {% highlight html %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
+{% endhighlight %}
+
+    <h3 id="overview-responsive-images">Responsive images</h3>
+    <p>Images in Bootstrap 3 can be made responsive-friendly via the addition of the <code>.img-responsive</code> class. This applies <code>max-width: 100%;</code> and <code>height: auto;</code> to the image so that it scales nicely to the parent element.</p>
+{% highlight html %}
+<img src="..." class="img-responsive" alt="Reponsive image">
 {% endhighlight %}
 
     <h3 id="overview-type-links">Typography and links</h3>
@@ -39,13 +45,13 @@ base_url: "../"
       <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>
-    <p>These styles can be found within <strong>scaffolding.less</strong>.</p>
+    <p>These styles can be found within <code>scaffolding.less</code>.</p>
 
     <h3 id="overview-normalize">Normalize reset</h3>
     <p>For improved cross-browser rendering, we use <a href="http://necolas.github.io/normalize.css/" target="_blank">Normalize</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a>.</p>
 
     <h3 id="overview-container">Centering with container</h3>
-    <p>Easily center a page's contents by wrapping its contents in a container. Containers set <code>max-width</code> at various media query breakpoints to match our grid system.</p>
+    <p>Easily center a page's contents by wrapping its contents in a <code>.container</code>. Containers set <code>max-width</code> at various media query breakpoints to match our grid system.</p>
 {% highlight html %}
 <div class="container">
   ...
@@ -616,7 +622,7 @@ base_url: "../"
     <p>For quoting blocks of content from another source within your document.</p>
 
     <h3>Default blockquote</h3>
-    <p>Wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.</p>
+    <p>Wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes, we recommend a <code>&lt;p&gt;</code>.</p>
     <div class="bs-example">
       <blockquote>
         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@@ -629,7 +635,7 @@ base_url: "../"
 {% endhighlight %}
 
     <h3>Blockquote options</h3>
-    <p>Style and content changes for simple variations on a standard blockquote.</p>
+    <p>Style and content changes for simple variations on a standard <code>&lt;blockquote&gt;</code>.</p>
 
     <h4>Naming a source</h4>
     <p>Add <code>&lt;small&gt;</code> tag for identifying the source. Wrap the name of the source work in <code>&lt;cite&gt;</code>.</p>
@@ -827,7 +833,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 <pre>&lt;p&gt;Sample text here...&lt;/p&gt;</pre>
 {% endhighlight %}
 
-    <p>You may optionally add the <code>.pre-scrollable</code> class which will set a max-height of 350px and provide a y-axis scrollbar.</p>
+    <p>You may optionally add the <code>.pre-scrollable</code> class, which will set a max-height of 350px and provide a y-axis scrollbar.</p>
   </div>
 
 
@@ -887,7 +893,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Use <code>.table-striped</code> to add zebra-striping to any table row within the <code>&lt;tbody&gt;</code>.</p>
     <div class="bs-callout bs-callout-danger">
       <h4>Cross-browser compatibility</h4>
-      <p>Striped tables are styled via the <code>:nth-child</code> CSS selector, which is not available in IE8.</p>
+      <p>Striped tables are styled via the <code>:nth-child</code> CSS selector, which is not available in Internet Explorer 8.</p>
     </div>
     <div class="bs-example">
       <table class="table table-striped">
@@ -1306,7 +1312,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <p>Examples of standard form controls supported in an example form layout.</p>
 
     <h3>Inputs</h3>
-    <p>Most common form control, text-based input fields. Includes support for all HTML5 types: text, password, datetime, datetime-local, date, month, time, week, number, email, url, search, tel, and color.</p>
+    <p>Most common form control, text-based input fields. Includes support for all HTML5 types: <code>text</code>, <code>password</code>, <code>datetime</code>, <code>datetime-local</code>, <code>date</code>, <code>month</code>, <code>time</code>, <code>week</code>, <code>number</code>, <code>email</code>, <code>url</code>, <code>search</code>, <code>tel</code>, and <code>color</code>.</p>
     <div class="bs-callout bs-callout-danger">
       <h4>Type declaration required</h4>
       <p>Inputs will only be fully styled if their <code>type</code> is properly declared.</p>
@@ -1466,7 +1472,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 
     <div class="bs-callout bs-callout-danger">
       <h4>Cross-browser compatibility</h4>
-      <p>While Bootstrap will apply these styles in all browsers, IE and Safari don't actually support the <code>disabled</code> attribute on a <code>&lt;fieldset&gt;</code>. Use custom JavaScript to disable the fieldset in these browsers.</p>
+      <p>While Bootstrap will apply these styles in all browsers, Internet Explorer 9 and below don't actually support the <code>disabled</code> attribute on a <code>&lt;fieldset&gt;</code>. Use custom JavaScript to disable the fieldset in these browsers.</p>
     </div>
 
     <form class="bs-example form-inline">
@@ -1778,6 +1784,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 <img src="..." class="img-thumbnail">
 {% endhighlight %}
 
+    <div class="bs-callout bs-callout-warning">
+      <h4>Responsive images</h4>
+      <p>Looking for how to make images more responsive? <a href="../css#overview-responsive-images">Check out the responsive images section</a> up top.</p>
+    </div>
+
   </div>
 
 
@@ -1963,7 +1974,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </li>
       <li>
         <span class="visible-lg">Large</span>
-        <span class="hidden-lg">&#10004; Hidden on desktop</span>
+        <span class="hidden-lg">&#10004; Hidden on large</span>
       </li>
     </ul>
 

dist/css/bootstrap.css

@@ -2566,7 +2566,7 @@ button.close {
   float: none;
 }
 
-.nav-stacked > li + li > a {
+.nav-stacked > li + li {
   margin-top: 2px;
   margin-left: 0;
 }

javascript.html

@@ -742,10 +742,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
     <h3>Four directions</h3>
     <div class="bs-example tooltip-demo">
       <div class="bs-example-tooltips">
-        <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Tooltip on top">Tooltip on top</button>
-        <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button>
-        <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">Tooltip on bottom</button>
         <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</button>
+        <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Tooltip on top">Tooltip on top</button>
+        <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">Tooltip on bottom</button>
+        <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button>
       </div>
     </div><!-- /example -->
 

js/.jshintrc

@@ -3,9 +3,11 @@
   "laxcomma" : true,
   "laxbreak" : true,
   "browser"  : true,
+  "eqeqeq"   : false,
   "eqnull"   : true,
   "debug"    : true,
   "devel"    : true,
+  "curly"    : false,
   "boss"     : true,
   "expr"     : true,
   "asi"      : true

less/navs.less

@@ -148,10 +148,8 @@
   > li {
     float: none;
     + li {
-      > a {
-        margin-top: 2px;
-        margin-left: 0; // no need for this gap between nav items
-      }
+      margin-top: 2px;
+      margin-left: 0; // no need for this gap between nav items
     }
   }
 }