From de2971c9cc34b0cef59a35111dc281dd4b9f07a1 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 10 Aug 2015 15:49:41 -0700
Subject: [PATCH] update nav
---
docs/_data/nav.yml | 13 +------------
docs/layout/media-object.md | 8 ++++++--
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml
index c460a64259..7e34b4f5c9 100644
--- a/docs/_data/nav.yml
+++ b/docs/_data/nav.yml
@@ -1,18 +1,12 @@
- title: Getting started
pages:
- # - title: Overview
- # - title: Download
- # - title: Contents
# - title: JavaScript
- # - title: Compiling
- # - title: Customize
- # - title: Flexbox
- # - title: Support
# - title: Accessibility
- title: Introduction
- title: Download
- title: Browsers & devices
- title: Options
+ - title: Flexbox
- title: Build tools
- title: Best practices
@@ -34,11 +28,6 @@
- title: Components
pages:
- # - title: Reboot
- # - title: Typography
- # - title: Images
- # - title: Code
- # - title: Tables
- title: Buttons
- title: Button group
- title: Button dropdown
diff --git a/docs/layout/media-object.md b/docs/layout/media-object.md
index 79eac78655..ea2f072251 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
--
GitLab