Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip

Conflicts:
	less/tests/navbar-fixed-top.html
	less/tests/navbar-static-top.html
	less/tests/navbar.html

5 files changed, 11 insertions, 11 deletions

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index eb45fe41ee..423fdc6d37 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -56,7 +56,7 @@ body {
 }
 
 /* Offset the responsive button for proper vertical alignment */
-.navbar .btn-navbar {
+.navbar .navbar-toggle {
   margin-top: 10px;
 }
 
@@ -258,12 +258,12 @@ body {
     <div class="navbar navbar-inverse">
       <div class="navbar-inner">
         <!-- Responsive Navbar Part 1: Button for triggering responsive navbar (not covered in tutorial). Include responsive CSS to utilize. -->
-        <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="brand" href="#">Project name</a>
+        <a class="navbar-brand" href="#">Project name</a>
         <!-- Responsive Navbar Part 2: Place all navbar contents you want collapsed withing .navbar-collapse.collapse. -->
         <div class="nav-collapse collapse">
           <ul class="nav">
diff --git a/docs/examples/jumbotron.html b/docs/examples/jumbotron.html
index 907d1413a8..fafa53d494 100644
--- a/docs/examples/jumbotron.html
+++ b/docs/examples/jumbotron.html
@@ -39,12 +39,12 @@ title: Jumbotron template
 
 <div class="navbar navbar-inverse navbar-fixed-top">
   <div class="container">
-    <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+    <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
     </a>
-    <a class="brand" href="#">Project name</a>
+    <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
       <ul class="nav">
         <li class="active"><a href="#">Home</a></li>
diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html
index d8cbfdd70e..c45c9445ea 100644
--- a/docs/examples/starter-template.html
+++ b/docs/examples/starter-template.html
@@ -18,12 +18,12 @@ title: Starter template
 <div class="navbar navbar-inverse navbar-fixed-top">
   <div class="navbar-inner">
     <div class="container">
-      <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="brand" href="#">Project name</a>
+      <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
         <ul class="nav">
           <li class="active"><a href="#">Home</a></li>
@@ -42,4 +42,4 @@ title: Starter template
     <p class="lead">Use this document as a way to quickly start any new project.<br> All you get is this text and a mostly barebones HTML document.</p>
   </div>
 
-</div><!-- /container -->
\ No newline at end of file
+</div><!-- /container -->
diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html
index 20ce2b4a24..b00bfd5aba 100644
--- a/docs/examples/sticky-footer-navbar.html
+++ b/docs/examples/sticky-footer-navbar.html
@@ -70,12 +70,12 @@ title: Sticky footer with navbar template
   <!-- Fixed navbar -->
   <div class="navbar navbar-fixed-top">
     <div class="container">
-      <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="brand" href="#">Project name</a>
+      <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
         <ul class="nav">
           <li class="active"><a href="#">Home</a></li>
diff --git a/docs/javascript.html b/docs/javascript.html
index e424445416..45ebb5ee82 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -369,7 +369,7 @@ $('#myModal').on('hidden', function () {
             <div id="navbar-example" class="navbar navbar-static">
               <div class="navbar-inner">
                 <div class="container" style="width: auto;">
-                  <a class="brand" href="#">Project Name</a>
+                  <a class="navbar-brand" href="#">Project Name</a>
                   <ul class="nav" role="navigation">
                     <li class="dropdown">
                       <a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>