From f98f9c91553b0c44c48b1a561411ff4e8714817a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 May 2016 12:41:26 -0700 Subject: add docs note to clear up #18599--active states for navbars can be on anchors or parents --- docs/components/navbar.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/components') diff --git a/docs/components/navbar.md b/docs/components/navbar.md index 5f7f36634..3387374f3 100644 --- a/docs/components/navbar.md +++ b/docs/components/navbar.md @@ -75,6 +75,8 @@ The `.navbar-brand` can be applied to most elements, but an anchor works best as Navbar navigation is similar to our regular nav options—use the `.nav` base class with a modifier to achieve a particular look. In this case you'll want `.nav.navbar-nav`. +Active states—with `.active`—to indicate the current page can be applied directly to `.nav-link`s or their immediate parent `.nav-item`s. + {% example html %} {% endexample %} +### Text + +Navbars may contain bits of text with the help of `.navbar-text`. This class adjusts vertical alignment and horizontal spacing for strings of text. + +{% example html %} + +{% endexample %} + +Using our utility classes, you can change the alignment of your navbar text. + +{% example html %} + +{% endexample %} + ## Color schemes -- cgit v1.2.3 From d4457b33032d2540a4a3b7fa600f22055ce2000d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 May 2016 12:37:47 -0700 Subject: improve docs examples for .navbar-text --- docs/components/navbar.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'docs/components') diff --git a/docs/components/navbar.md b/docs/components/navbar.md index 086d49bcb..a82f881a2 100644 --- a/docs/components/navbar.md +++ b/docs/components/navbar.md @@ -142,18 +142,32 @@ Navbars may contain bits of text with the help of `.navbar-text`. This class adj {% example html %} {% endexample %} -Using our utility classes, you can change the alignment of your navbar text. +Using our utility classes, you can change the alignment and appearance of your navbar text. {% example html %} {% endexample %} +Similarly, you can use utility classes to align navbar text to other navbar elements like the brand and navigation (which are automatically floated already). + +{% example html %} + +{% endexample %} ## Color schemes -- cgit v1.2.3 From d11c93341f392d654b2cb5cbefd399bbf1d81f00 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Sep 2016 13:32:09 -0700 Subject: fix that navbar toggler example in docs --- docs/components/navbar.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docs/components') diff --git a/docs/components/navbar.md b/docs/components/navbar.md index bb390a55c..d3747a87f 100644 --- a/docs/components/navbar.md +++ b/docs/components/navbar.md @@ -316,9 +316,7 @@ Our collapse plugin allows you to use a ` +