From: Mark Otto <markdotto@gmail.com>
Date: Sun, 15 May 2016 19:29:56 +0000 (-0700)
Subject: Restore .navbar-text and add some basic examples to the docs /cc #18049
X-Git-Tag: v4.0.0-alpha.5~4^2~17^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfa2536c3b7070207a2d1fb21873639b41ae405c;p=thirdparty%2Fbootstrap.git

Restore .navbar-text and add some basic examples to the docs /cc #18049
---

diff --git a/docs/components/navbar.md b/docs/components/navbar.md
index 10d6547d0d..086d49bcba 100644
--- a/docs/components/navbar.md
+++ b/docs/components/navbar.md
@@ -68,7 +68,6 @@ The `.navbar-brand` can be applied to most elements, but an anchor works best as
 <nav class="navbar navbar-light bg-faded">
   <h1 class="navbar-brand m-b-0">Navbar</h1>
 </nav>
-
 {% endexample %}
 
 ### Nav
@@ -137,6 +136,24 @@ You may also utilize dropdowns in your navbar nav. Dropdown menus require a wrap
 </nav>
 {% 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 %}
+<nav class="navbar navbar-light bg-faded">
+  <span class="navbar-text">Navbar text with an inline element</span>
+</nav>
+{% endexample %}
+
+Using our utility classes, you can change the alignment of your navbar text.
+
+{% example html %}
+<nav class="navbar navbar-light bg-faded">
+  <span class="navbar-text pull-xs-right">Navbar text that's floated right</span>
+</nav>
+{% endexample %}
+
 
 ## Color schemes
 
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 9d3db1b263..64409f715a 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -99,6 +99,17 @@
 }
 
 
+// Navbar text
+//
+//
+
+.navbar-text {
+  display: inline-block;
+  padding-top:    .425rem;
+  padding-bottom: .425rem;
+}
+
+
 // Navbar toggle
 //
 // Custom button for toggling the `.navbar-collapse`, powered by the collapse