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

docs/assets/css/bootstrap.css

@@ -1550,6 +1550,12 @@ fieldset[disabled] input[type="checkbox"] {
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
 }
 
+.has-warning .input-group-addon {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+
 .has-error .control-label {
   color: #b94a48;
 }
@@ -1567,6 +1573,12 @@ fieldset[disabled] input[type="checkbox"] {
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
 }
 
+.has-error .input-group-addon {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+
 .has-success .control-label {
   color: #468847;
 }
@@ -1584,6 +1596,12 @@ fieldset[disabled] input[type="checkbox"] {
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
 }
 
+.has-success .input-group-addon {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+
 input:focus:invalid,
 textarea:focus:invalid,
 select:focus:invalid {

docs/css.html

@@ -621,7 +621,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
 {% highlight html %}
 <blockquote>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
-  <small>Someone famous <cite title="Source Title">Source Title</cite></small>
+  <small>Someone famous in <cite title="Source Title">Source Title</cite></small>
 </blockquote>
 {% endhighlight %}
 

less/mixins.less

@@ -486,4 +486,10 @@
       .box-shadow(@shadow);
     }
   }
+  // Set validation states also for addons
+  .input-group-addon {
+    color: @text-color;
+    border-color: @border-color;
+    background-color: @background-color;
+  }  
 }