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

3 files changed, 0 insertions, 44 deletions

diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html
index f1596f7ef..437b2e3bd 100644
--- a/docs/_includes/nav-css.html
+++ b/docs/_includes/nav-css.html
@@ -54,7 +54,6 @@
     <li><a href="#forms-control-states">Control states</a></li>
     <li><a href="#forms-input-groups">Input groups</a></li>
     <li><a href="#forms-control-sizes">Control sizing</a></li>
-    <li><a href="#forms-actions">Form actions</a></li>
     <li><a href="#forms-help-text">Help text</a></li>
   </ul>
 </li>
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index bec7260c2..326ae4990 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1535,34 +1535,6 @@ select:focus:invalid:focus {
           box-shadow: 0 0 6px #f8b9b7;
 }
 
-.form-actions {
-  padding: 20px 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #e5e5e5;
-}
-
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  content: " ";
-}
-
-.form-actions:after {
-  clear: both;
-}
-
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  content: " ";
-}
-
-.form-actions:after {
-  clear: both;
-}
-
 .help-block {
   display: block;
   margin-top: 5px;
diff --git a/docs/css.html b/docs/css.html
index 36b5208e6..90f6f490f 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -1663,21 +1663,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 </div>
 {% endhighlight %}
 
-    <h3 id="forms-actions">Form actions</h3>
-    <p>End a form with a group of actions (buttons). When placed within a <code>.form-horizontal</code>, the buttons will automatically indent to line up with the form controls.</p>
-    <form class="bs-example">
-      <div class="form-actions">
-        <button type="submit" class="btn btn-primary">Save changes</button>
-        <button type="button" class="btn btn-default">Cancel</button>
-      </div>
-    </form>
-{% highlight html %}
-<div class="form-actions">
-  <button type="submit" class="btn btn-primary">Save changes</button>
-  <button type="button" class="btn btn-default">Cancel</button>
-</div>
-{% endhighlight %}
-
     <h3 id="forms-help-text">Help text</h3>
     <p>Block level help text for form controls.</p>
     <form class="bs-example">