From c59dbe56fe07cadf4ad09659d65d7090a07f2fbb Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 6 Feb 2016 15:40:25 -0800
Subject: [PATCH] Drop .center-block for .m-x-auto

- Both classes do about the same thing, but with different names
- Clarifies docs for .m-x-auto requiring a fixed width block element for it to work
- Add missing heading for clearfix section in docs (unrelated)
---
 docs/components/utilities.md      | 35 ++++++++++++-------------------
 scss/_mixins.scss                 |  1 -
 scss/_utilities.scss              |  1 -
 scss/mixins/_center-block.scss    |  7 -------
 scss/utilities/_center-block.scss |  3 ---
 5 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 scss/mixins/_center-block.scss
 delete mode 100644 scss/utilities/_center-block.scss

diff --git a/docs/components/utilities.md b/docs/components/utilities.md
index 00bc96721c..e59869fcd5 100644
--- a/docs/components/utilities.md
+++ b/docs/components/utilities.md
@@ -60,8 +60,19 @@ Here are some representative examples of these classes:
 }
 {% endhighlight %}
 
-Additionally, Bootstrap also includes an `.m-x-auto` class which sets the horizontal margins to `auto`.
+Additionally, Bootstrap also includes an `.m-x-auto` class for centering fixed-width block level content by setting the horizontal margins to `auto`.
 
+<div class="bd-example">
+  <div class="m-x-auto" style="width: 200px; background-color: rgba(86,61,124,.15);">
+    Centered element
+  </div>
+</div>
+
+{% highlight html %}
+<div class="m-x-auto" style="width: 200px;"">
+  Centered element
+</div>
+{% endhighlight %}
 
 ## Text alignment
 
@@ -191,27 +202,7 @@ Two similar non-responsive mixins (`pull-left` and `pull-right`) are also availa
 }
 {% endhighlight %}
 
-## Center content
-
-Set an element to `display: block;` and center via `margin`. Available as a mixin and class.
-
-{% example html %}
-<div class="center-block">Centered block</div>
-{% endexample %}
-
-{% highlight scss %}
-// Class
-.center-block {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-// Usage as a mixin
-.element {
-  @include center-block;
-}
-{% endhighlight %}
+## Clearfix
 
 Easily clear `float`s by adding `.clearfix` **to the parent element**. Utilizes [the micro clearfix](http://nicolasgallagher.com/micro-clearfix-hack/) as popularized by Nicolas Gallagher. Can also be used as a mixin.
 
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 934769fdcd..5c86512070 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -48,7 +48,6 @@
 
 // // Layout
 @import "mixins/clearfix";
-@import "mixins/center-block";
 // @import "mixins/navbar-align";
 @import "mixins/grid-framework";
 @import "mixins/grid";
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index ac703bc467..3f9e81f125 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -1,5 +1,4 @@
 @import "utilities/background";
-@import "utilities/center-block";
 @import "utilities/clearfix";
 @import "utilities/pulls";
 @import "utilities/screenreaders";
diff --git a/scss/mixins/_center-block.scss b/scss/mixins/_center-block.scss
deleted file mode 100644
index e06fb5e276..0000000000
--- a/scss/mixins/_center-block.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// Center-align a block level element
-
-@mixin center-block() {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
diff --git a/scss/utilities/_center-block.scss b/scss/utilities/_center-block.scss
deleted file mode 100644
index 0c986667ae..0000000000
--- a/scss/utilities/_center-block.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.center-block {
-  @include center-block();
-}