Merge branch '3.0.0-wip' into bs3_makefile_separated_done

Conflicts:
	Makefile

1 files changed, 38 insertions, 8 deletions

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 08a51ee10..e8cecc2fc 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -175,61 +175,91 @@ description: Overview of the project, its contents, and how to get started with
         <p class="lead">Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
         <div class="row bs-docs-examples">
           <div class="span4">
-            <a class="thumbnail" href="/examples/starter-template/">
+            <a class="thumbnail" href="/examples/starter-template/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-starter.png" alt="">
             </a>
             <h4>Starter template</h4>
             <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
           </div>
           <div class="span4">
-            <a class="thumbnail" href="/examples/jumbotron/">
+            <a class="thumbnail" href="/examples/jumbotron/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-marketing.png" alt="">
             </a>
             <h4>Basic marketing site</h4>
             <p>Featuring a hero unit for a primary message and three supporting elements.</p>
           </div>
           <div class="span4">
-            <a class="thumbnail" href="/examples/jumbotron-narrow/">
+            <a class="thumbnail" href="/examples/jumbotron-narrow/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-jumbotron-narrow.png" alt="">
             </a>
             <h4>Narrow marketing</h4>
             <p>Slim, lightweight marketing template for small projects or teams.</p>
           </div>
           <div class="span4">
-            <a class="thumbnail" href="/examples/justified-nav/">
+            <a class="thumbnail" href="/examples/justified-nav/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-justified-nav.png" alt="">
             </a>
             <h4>Justified nav</h4>
             <p>Marketing page with equal-width navigation links in a modified navbar.</p>
           </div>
           <div class="span4">
-            <a class="thumbnail" href="/examples/signin/">
+            <a class="thumbnail" href="/examples/signin/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-signin.png" alt="">
             </a>
             <h4>Sign in</h4>
             <p>Barebones sign in form with custom, larger form controls and a flexible layout.</p>
           </div>
           <div class="span4">
-            <a class="thumbnail" href="/examples/sticky-footer/">
+            <a class="thumbnail" href="/examples/sticky-footer/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
             </a>
             <h4>Sticky footer</h4>
             <p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
           </div>
           <div class="span4">
-            <a class="thumbnail" href="/examples/sticky-footer-navbar/">
+            <a class="thumbnail" href="/examples/sticky-footer-navbar/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-sticky-footer-navbar.png" alt="">
             </a>
             <h4>Sticky footer w/ navbar</h4>
             <p>Add a fixed navbar to the default sticky footer template.</p>
           </div>
           <div class="span4">
-            <a class="thumbnail" href="/examples/carousel/">
+            <a class="thumbnail" href="/examples/carousel/" target="_blank">
               <img src="/assets/img/examples/bootstrap-example-carousel.png" alt="">
             </a>
             <h4>Carousel jumbotron</h4>
             <p>An interactive riff on the basic marketing site featuring a prominent carousel.</p>
           </div>
+
+
+          <div class="span4">
+            <a class="thumbnail" href="/examples/navbar/" target="_blank">
+              <img src="/assets/img/examples/bootstrap-example-navbar.png" alt="">
+            </a>
+            <h4>Navbar</h4>
+            <p>Basic template for showcasing how the navbar works.</p>
+          </div>
+          <div class="span4">
+            <a class="thumbnail" href="/examples/navbar-static-top/" target="_blank">
+              <img src="/assets/img/examples/bootstrap-example-navbar-static-top.png" alt="">
+            </a>
+            <h4>Static top navbar</h4>
+            <p>Basic template for showcasing the static navbar variation.</p>
+          </div>
+          <div class="span4">
+            <a class="thumbnail" href="/examples/navbar-fixed-top/" target="_blank">
+              <img src="/assets/img/examples/bootstrap-example-navbar-fixed-top.png" alt="">
+            </a>
+            <h4>Fixed top navbar</h4>
+            <p>Basic template for showcasing the fixed navbar variation.</p>
+          </div>
+          <div class="span4">
+            <a class="thumbnail" href="/examples/grid/" target="_blank">
+              <img src="/assets/img/examples/bootstrap-example-.png" alt="">
+            </a>
+            <h4>Grid examples</h4>
+            <p></p>
+          </div>
         </div>
       </section>