From f1e10c37fd304865f8036dce5001276011461e10 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Aug 2015 23:43:59 -0700 Subject: [PATCH] rewrite navbar bits some more --- docs/components/navbar.md | 206 +++++++++----------------------------- scss/_navbar.scss | 165 +++++++++--------------------- scss/_variables.scss | 10 +- 3 files changed, 103 insertions(+), 278 deletions(-) diff --git a/docs/components/navbar.md b/docs/components/navbar.md index dd3a620f1e..5cdf15803c 100644 --- a/docs/components/navbar.md +++ b/docs/components/navbar.md @@ -4,41 +4,37 @@ title: Navbar group: components --- -The navbar is a simple wrapper for positioning branding, navigation, and other elements. It's easily extensible and with the help of our collapse plugin it can easily integrate offscreen content. +The navbar is a simple wrapper for positioning branding, navigation, and other elements. It's easily extensible and, with the help of our collapse plugin, it can easily integrate offscreen content. ## Contents * Will be replaced with the ToC, excluding the "Contents" header {:toc} -### Basics +## Basics Here's what you need to know before getting started with the navbar: -- Navbars require a wrapping `.navbar` and either a color scheme class or custom styles. +- Navbars require a wrapping `.navbar` and a color scheme class (either `.navbar-default` or `.navbar-inverse`). - When using multiple components in a navbar, some [alignment classes](#alignment) are required. - Navbars and their contents are fluid by default. Use [optional containers](#containers) to limit their horizontal width. +- Use `.pull-left` and `.pull-right` to quickly align sub-components. - Ensure accessibility by using a `