Merge branch 'master' into table-nesting

Conflicts:
	dist/css/bootstrap.min.css

components.html

@@ -2209,7 +2209,7 @@ body { padding-bottom: 70px; }
     <div class="page-header">
       <h1 id="alerts">Alerts</h1>
     </div>
-    <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#js-alerts">alerts jQuery plugin</a>.</p>
+    <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#alerts">alerts jQuery plugin</a>.</p>
 
     <h2 id="alerts-examples">Examples</h2>
     <p>Wrap any text and an optional dismiss button in <code>.alert</code> and one of the four contextual classes (e.g., <code>.alert-success</code>) for basic alert messages.</p>
@@ -2243,13 +2243,13 @@ body { padding-bottom: 70px; }
     <h2 id="alerts-dismissable">Dismissable alerts</h2>
     <p>Build on any alert by adding an optional <code>.alert-dismissable</code> and close button.</p>
     <div class="bs-example">
-      <div class="alert alert-warning alert-dismissable alert-warning">
+      <div class="alert alert-warning alert-dismissable">
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
         <strong>Warning!</strong> Best check yo self, you're not looking too good.
       </div>
     </div>
 {% highlight html %}
-<div class="alert alert-warning alert-dismissable alert-warning">
+<div class="alert alert-warning alert-dismissable">
   <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
   <strong>Warning!</strong> Best check yo self, you're not looking too good.
 </div>

css.html

@@ -501,7 +501,7 @@ base_url: "../"
   }
 }
 
-// Generate the large column offsets
+// Generate the medium column offsets
 .make-md-column-offset(@columns) {
   @media (min-width: @screen-medium) {
     margin-left: percentage((@columns / @grid-columns));

customize.html

@@ -421,15 +421,14 @@ base_url: "../"
       <div class="col-lg-6">
         <label>@headings-font-family</label>
         <input type="text" class="form-control" placeholder="@font-family-base" data-var="@headings-font-family">
-        <p class="help-block">Choose a separate font-family for headings.</p>
         <label>@headings-font-weight</label>
         <input type="text" class="form-control" placeholder="500" data-var="@headings-font-weight">
-        <p class="help-block">Choose a separate font-weight for headings.</p>
       </div>
       <div class="col-lg-6">
         <label>@headings-line-height</label>
         <input type="text" class="form-control" placeholder="1.1" data-var="@headings-line-height">
-        <p class="help-block">Choose a separate line-height for headings.</p>
+        <label>@headings-color</label>
+        <input type="text" class="form-control" placeholder="inherit" data-var="@headings-color">
       </div>
     </div>
 

dist/css/bootstrap.css

@@ -316,13 +316,6 @@ textarea {
   line-height: inherit;
 }
 
-button,
-input,
-select[multiple],
-textarea {
-  background-image: none;
-}
-
 a {
   color: #428bca;
   text-decoration: none;
@@ -406,7 +399,8 @@ p {
   }
 }
 
-small {
+small,
+.small {
   font-size: 85%;
 }
 
@@ -465,6 +459,7 @@ h6,
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-weight: 500;
   line-height: 1.1;
+  color: inherit;
 }
 
 h1 small,
@@ -1724,6 +1719,7 @@ output {
   color: #555555;
   vertical-align: middle;
   background-color: #ffffff;
+  background-image: none;
   border: 1px solid #cccccc;
   border-radius: 4px;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -2006,6 +2002,7 @@ textarea.input-lg {
   white-space: nowrap;
   vertical-align: middle;
   cursor: pointer;
+  background-image: none;
   border: 1px solid transparent;
   border-radius: 4px;
   -webkit-user-select: none;
@@ -3719,6 +3716,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   font-size: 14px;
   font-weight: normal;
   line-height: 1;
+  color: #555555;
   text-align: center;
   background-color: #eeeeee;
   border: 1px solid #cccccc;

examples/carousel/index.html

@@ -74,7 +74,7 @@
       </ol>
       <div class="carousel-inner">
         <div class="item active">
-          <img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:First slide" alt="First slide">
+          <img src="data:image/png;base64," data-src="holder.js/900x500/auto/#777:#7a7a7a/text:First slide" alt="First slide">
           <div class="container">
             <div class="carousel-caption">
               <h1>Example headline.</h1>
@@ -84,7 +84,7 @@
           </div>
         </div>
         <div class="item">
-          <img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:Second slide" alt="Second slide">
+          <img src="data:image/png;base64," data-src="holder.js/900x500/auto/#666:#6a6a6a/text:Second slide" alt="Second slide">
           <div class="container">
             <div class="carousel-caption">
               <h1>Another example headline.</h1>
@@ -94,7 +94,7 @@
           </div>
         </div>
         <div class="item">
-          <img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:Third slide" alt="Third slide">
+          <img src="data:image/png;base64," data-src="holder.js/900x500/auto/#555:#5a5a5a/text:Third slide" alt="Third slide">
           <div class="container">
             <div class="carousel-caption">
               <h1>One more for good measure.</h1>

getting-started.html

@@ -16,7 +16,7 @@ base_url: "../"
     <p class="lead">Bootstrap has a few easy ways to quickly get started, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>
 
     <h3 id="download-compiled">Compiled CSS, JS, and fonts</h3>
-    <p>The fastest way to get Bootstrap is to download the compiled and minified versions of our CSS and JavaScript, along with the included fonts. No documentation or original source files are included.</p>
+    <p>The fastest way to get Bootstrap is to download the precompiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source code files are included.</p>
     <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);" role="button">Download precompiled Bootstrap</a></p>
 
     <h3 id="download-additional">Additional downloads</h3>
@@ -24,20 +24,20 @@ base_url: "../"
       <h4>
         <a href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source code</a>
       </h4>
-      <p>Get the original files for all CSS and JavaScript by downloading the full release directly from GitHub.</p>
+      <p>Get the latest Bootstrap CSS and JavaScript source code by downloading it directly from GitHub.</p>
       <h4>
         <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'GitHub project']);">Clone or fork via GitHub</a>
       </h4>
-      <p>Clone the entire project or fork your own version of Bootstrap to make it your own by visiting us on GitHub.</p>
+      <p>Visit us on GitHub to clone or fork the Bootstrap project.</p>
       <h4>
         Install with <a href="http://bower.io">Bower</a>
       </h4>
-      <p>Install and manage the original files for all CSS and JavaScript, along with a local copy of the docs, using <a href="http://bower.io">Bower</a>.</p>
+      <p>Install and manage Bootstrap's CSS, JavaScript, and documentation using <a href="http://bower.io">Bower</a>.</p>
       {% highlight bash %}$ bower install bootstrap{% endhighlight %}
     </div>
 
     <h3 id="download-cdn">Bootstrap CDN</h3>
-    <p>The folks over at <a href="https://www.netdna.com/">NetDNA</a> have graciously provided CDN support for Bootstrap's CSS and JavaScript. To use, swap your local instances for the <a href="http://www.bootstrapcdn.com/">Bootstrap CDN</a> links listed below.</p>
+    <p>The folks over at <a href="https://www.netdna.com/">NetDNA</a> graciously provide CDN support for Bootstrap's CSS and JavaScript. Just use these <a href="http://www.bootstrapcdn.com/">Bootstrap CDN</a> links.</p>
 {% highlight html %}
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="{{ site.cdn_css }}">
@@ -50,13 +50,11 @@ base_url: "../"
 {% endhighlight %}
 
     <div class="bs-callout bs-callout-warning" id="callout-less-compilation">
-      <h4>LESS compilation</h4>
+      <h4>Compiling Bootstrap's LESS files</h4>
-      <p>If you download the original files, you need to compile Bootstrap's LESS files into usable CSS. To do that, Bootstrap only officially supports <a href="http://twitter.github.io/recess/">Recess</a>, Twitter's CSS hinter built on top of <a href="http://lesscss.org">less.js</a>.</p>
+      <p>If you work with Bootstrap's uncompiled source code, you need to compile the LESS files to produce usable CSS files. We officially support <a href="http://twitter.github.io/recess/">Recess</a>, which is Twitter's CSS hinter based on <a href="http://lesscss.org">less.js</a>.</p>
     </div>
   </div>
 
-
-
   <!-- File structure
   ================================================== -->
   <div class="bs-docs-section">
@@ -98,9 +96,10 @@ bootstrap/
     <div class="page-header">
       <h1 id="template">Basic template</h1>
     </div>
-    <p class="lead">Make use of a super basic HTML template, or dive into a <a href="../getting-started#examples">few examples</a> we've started for you. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
+    <p class="lead">Start with this basic HTML template, or modify <a href="../getting-started#examples">these examples</a>. 
+    We hope you'll customize our templates and examples, adapting them to suit your needs.</p>
 
-    <p>Copy and paste the HTML from below to get started with a bare bones Bootstrap document.</p>
+    <p>Copy the HTML below to begin working with a minimal Bootstrap document.</p>
 {% highlight html %}
 <!DOCTYPE html>
 <html>
@@ -367,6 +366,10 @@ bootstrap/
             <td><code>.btn-large</code></td>
             <td><code>.btn-lg</code></td>
           </tr>
+          <tr>
+            <td><code>.alert-error</code></td>
+            <td><code>.alert-danger</code></td>
+          </tr>
           <tr>
             <td><code>.visible-phone</code></td>
             <td><code>.visible-xs</code></td>
@@ -427,6 +430,10 @@ bootstrap/
             <td><code>.muted</code></td>
             <td><code>.text-muted</code></td>
           </tr>
+          <tr>
+            <td><code>.text-error</code></td>
+            <td><code>.text-danger</code></td>
+          </tr>
         </tbody>
       </table>
     </div><!-- /.table-responsive -->

js/tests/phantom.js

@@ -1,63 +0,0 @@
-// Simple phantom.js integration script
-// Adapted from Modernizr
-
-function waitFor(testFx, onReady, timeOutMillis) {
-  var maxtimeOutMillis = timeOutMillis ? timeOutMillis :  5001 //< Default Max Timout is 5s
-    , start = new Date().getTime()
-    , condition = false
-    , interval = setInterval(function () {
-        if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) {
-          // If not time-out yet and condition not yet fulfilled
-          condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code
-        } else {
-          if (!condition) {
-            // If condition still not fulfilled (timeout but condition is 'false')
-            console.log("'waitFor()' timeout")
-            phantom.exit(1)
-          } else {
-            // Condition fulfilled (timeout and/or condition is 'true')
-            typeof(onReady) === "string" ? eval(onReady) : onReady() //< Do what it's supposed to do once the condition is fulfilled
-            clearInterval(interval) //< Stop this interval
-          }
-        }
-    }, 100) //< repeat check every 100ms
-}
-
-
-if (phantom.args.length === 0 || phantom.args.length > 2) {
-  console.log('Usage: phantom.js URL')
-  phantom.exit()
-}
-
-var page = new WebPage()
-
-// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
-page.onConsoleMessage = function(msg) {
-  console.log(msg)
-};
-
-page.open(phantom.args[0], function(status){
-  if (status !== "success") {
-    console.log("Unable to access network")
-    phantom.exit()
-  } else {
-    waitFor(function(){
-      return page.evaluate(function(){
-        var el = document.getElementById('qunit-testresult')
-        if (el && el.innerText.match('completed')) {
-          return true
-        }
-        return false
-      })
-    }, function(){
-      var failedNum = page.evaluate(function(){
-        var el = document.getElementById('qunit-testresult')
-        try {
-          return el.getElementsByClassName('failed')[0].innerHTML
-        } catch (e) { }
-        return 10000
-      });
-      phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0)
-    })
-  }
-})

js/tests/server.js

@@ -1,14 +0,0 @@
-/*
- * Simple connect server for phantom.js
- * Adapted from Modernizr
- */
-
-var connect = require('connect')
-  , http = require('http')
-  , fs   = require('fs')
-  , app = connect()
-      .use(connect.static(__dirname + '/../../'));
-
-http.createServer(app).listen(3000);
-
-fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8')

less/buttons.less

@@ -17,6 +17,7 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid transparent;
   border-radius: @border-radius-base;
   white-space: nowrap;

less/forms.less

@@ -133,6 +133,7 @@ output {
   color: @input-color;
   vertical-align: middle;
   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-radius: @input-border-radius;
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));

less/input-groups.less

@@ -61,6 +61,7 @@
   font-size: @font-size-base;
   font-weight: normal;
   line-height: 1;
+  color: @input-color;
   text-align: center;
   background-color: @input-group-addon-bg;
   border: 1px solid @input-group-addon-border-color;

less/scaffolding.less

@@ -37,17 +37,6 @@ textarea {
   line-height: inherit;
 }
 
-// Reset unusual Firefox-on-Android default style.
-//
-// See https://github.com/necolas/normalize.css/issues/214
-
-button,
-input,
-select[multiple],
-textarea {
-  background-image: none;
-}
-
 
 // Links
 

less/type.less

@@ -25,7 +25,8 @@ p {
 // -------------------------
 
 // Ex: 14px base font * 85% = about 12px
-small   { font-size: 85%; }
+small,
+.small  { font-size: 85%; }
 
 // Undo browser default styling
 cite    { font-style: normal; }
@@ -52,6 +53,7 @@ h1, h2, h3, h4, h5, h6,
   font-family: @headings-font-family;
   font-weight: @headings-font-weight;
   line-height: @headings-line-height;
+  color: inherit;
 
   small {
     font-weight: normal;

less/variables.less

@@ -61,6 +61,8 @@
 @headings-font-family:    @font-family-base;
 @headings-font-weight:    500;
 @headings-line-height:    1.1;
+@headings-color:          inherit;
+
 
 // Iconography
 // -------------------------