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

10 files changed, 10 insertions, 18 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5e5d325a6..5ebb752be 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3490,7 +3490,7 @@ button.close {
 
 .navbar {
   position: relative;
-  padding: 10px 15px;
+  padding: 0 15px;
   background-color: #eeeeee;
   border-radius: 4px;
 }
@@ -3741,10 +3741,6 @@ button.close {
 }
 
 @media screen and (min-width: 768px) {
-  .navbar {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
   .navbar-brand {
     float: left;
     margin-right: 5px;
diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 792949fb0..4142b38f4 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -243,7 +243,7 @@ body {
 	    </a>
         <a class="navbar-brand" href="#">Project name</a>
         <div class="nav-collapse collapse">
-          <ul class="nav">
+          <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
             <li><a href="#contact">Contact</a></li>
diff --git a/docs/examples/jumbotron.html b/docs/examples/jumbotron.html
index 86d035f07..68231a063 100644
--- a/docs/examples/jumbotron.html
+++ b/docs/examples/jumbotron.html
@@ -46,7 +46,7 @@ title: Jumbotron template
     </a>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <ul class="nav navbar-nav">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#about">About</a></li>
         <li><a href="#contact">Contact</a></li>
diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html
index f136ee92a..f8123388a 100644
--- a/docs/examples/justified-nav.html
+++ b/docs/examples/justified-nav.html
@@ -97,7 +97,7 @@ title: Justified nav template
 
   <div class="masthead">
     <h3 class="text-muted">Project name</h3>
-    <ul class="nav nav-justified">
+    <ul class="nav navbar-nav nav-justified">
       <li class="active"><a href="#">Home</a></li>
       <li><a href="#">Projects</a></li>
       <li><a href="#">Services</a></li>
diff --git a/docs/examples/navbar-fixed-top.html b/docs/examples/navbar-fixed-top.html
index 06ed424c2..906ca32c9 100644
--- a/docs/examples/navbar-fixed-top.html
+++ b/docs/examples/navbar-fixed-top.html
@@ -27,7 +27,7 @@ title: Fixed navbar template
         </a>
         <a class="navbar-brand" href="#">Project name</a>
         <div class="nav-collapse collapse">
-          <ul class="nav">
+          <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
             <li><a href="#contact">Contact</a></li>
diff --git a/docs/examples/navbar-static-top.html b/docs/examples/navbar-static-top.html
index 9a234114f..d636cbd3b 100644
--- a/docs/examples/navbar-static-top.html
+++ b/docs/examples/navbar-static-top.html
@@ -23,7 +23,7 @@ title: Static navbar template
     </a>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <ul class="nav navbar-nav">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#about">About</a></li>
         <li><a href="#contact">Contact</a></li>
diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html
index 5b5ffb77b..a74f3b356 100644
--- a/docs/examples/navbar.html
+++ b/docs/examples/navbar.html
@@ -29,7 +29,7 @@ title: Navbar template
       </a>
       <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
-        <ul class="nav">
+        <ul class="nav navbar-nav">
           <li class="active"><a href="#">Home</a></li>
           <li><a href="#about">About</a></li>
           <li><a href="#contact">Contact</a></li>
diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html
index 62da929da..18fdaf5fc 100644
--- a/docs/examples/starter-template.html
+++ b/docs/examples/starter-template.html
@@ -24,7 +24,7 @@ title: Starter template
     </button>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <ul class="nav navbar-nav">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#about">About</a></li>
         <li><a href="#contact">Contact</a></li>
diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html
index 716412a9d..429b74f91 100644
--- a/docs/examples/sticky-footer-navbar.html
+++ b/docs/examples/sticky-footer-navbar.html
@@ -77,7 +77,7 @@ title: Sticky footer with navbar template
       </button>
       <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
-        <ul class="nav">
+        <ul class="nav navbar-nav">
           <li class="active"><a href="#">Home</a></li>
           <li><a href="#about">About</a></li>
           <li><a href="#contact">Contact</a></li>
diff --git a/less/navbar.less b/less/navbar.less
index cc5e307e8..8cd43c300 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -5,7 +5,7 @@
 // Wrapper and base class
 .navbar {
   position: relative;
-  padding: 10px 15px;
+  padding: 0px 15px;
   background-color: @navbar-bg;
   border-radius: @border-radius-base;
   // Prevent floats from breaking the navbar
@@ -264,10 +264,6 @@
 
 @media screen and (min-width: @screen-tablet) {
 
-  .navbar {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
   .navbar-brand {
     float: left;
     margin-left: -5px;