aboutsummaryrefslogtreecommitdiff
path: root/docs/layout
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-08-10 15:49:41 -0700
committerMark Otto <[email protected]>2015-08-10 15:49:41 -0700
commitde2971c9cc34b0cef59a35111dc281dd4b9f07a1 (patch)
treef0fcf78d0bab209e3bbb0619049f9e1f77caec8c /docs/layout
parent84f544b1f236d3a0c67f41c180e834cb882c28cd (diff)
downloadbootstrap-de2971c9cc34b0cef59a35111dc281dd4b9f07a1.tar.xz
bootstrap-de2971c9cc34b0cef59a35111dc281dd4b9f07a1.zip
update nav
Diffstat (limited to 'docs/layout')
-rw-r--r--docs/layout/media-object.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/layout/media-object.md b/docs/layout/media-object.md
index 79eac7865..ea2f07225 100644
--- a/docs/layout/media-object.md
+++ b/docs/layout/media-object.md
@@ -1,10 +1,14 @@
---
layout: page
-title: Media
+title: Media object
group: layout
---
-Abstract object styles for building custom components (like blog comments, Tweets, etc) that feature a left- or right-aligned piece of content alongside textual content.
+The [media object](http://www.stubbornella.org/content/2010/06/25/the-media-object-saves-hundreds-of-lines-of-code/) is an abstract element used as the basis for building more complex and repetitive components (like blog comments, Tweets, etc). Included is support for left and right aligned content, content alignment options, nesting, and more.
+
+{% callout info %}
+**Heads up!** When [flexbox mode]({{ site.baseurl }}/getting-started/flexbox/) is enabled, the media object will use `flex` styles wherever possible.
+{% endcallout %}
## Contents