Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider

Conflicts:
	bootstrap.css

4 files changed, 20 insertions, 1 deletions

diff --git a/bootstrap.css b/bootstrap.css
index 5fb8b6fc8..79fe4826c 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sat Dec 10 22:29:17 PST 2011
+ * Date: Sun Dec 11 00:58:00 PST 2011
  */
 html, body {
   margin: 0;
@@ -1320,6 +1320,14 @@ table {
   background-color: #222;
   background-color: rgba(0, 0, 0, 0.5);
 }
+.nav .divider {
+  height: 40px;
+  width: 1px;
+  margin: 0 5px;
+  overflow: hidden;
+  background-color: #222;
+  border-right: 1px solid #444;
+}
 .nav.secondary-nav {
   float: right;
   margin-left: 10px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index eecca66d0..48cc90703 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -190,6 +190,7 @@ tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;}
 .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}.nav>li{display:block;float:left;}
 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;}
 .nav .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
+.nav .divider{height:40px;width:1px;margin:0 5px;overflow:hidden;background-color:#222;border-right:1px solid #444;}
 .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;border:0;}
 .nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);}
 .nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#ffffff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);}
diff --git a/docs/components.html b/docs/components.html
index d0456cc74..c8e0a6ab4 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -180,6 +180,7 @@
           <input type="text" class="search-query span2" placeholder="Search">
         </form>
         <ul class="nav secondary-nav">
+          <li class="divider"></li>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle">Dropdown</a>
             <ul class="dropdown-menu">
diff --git a/lib/patterns.less b/lib/patterns.less
index cd2fdc01e..558f3ca45 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -156,6 +156,15 @@
     background-color: #222;
     background-color: rgba(0,0,0,.5);
   }
+  // Dividers (basically a vertical hr)
+  .divider {
+    height: 40px;
+    width: 1px;
+    margin: 0 5px;
+    overflow: hidden;
+    background-color: #222;
+    border-right: 1px solid #444;
+  }
 
   // Secondary (floated right) nav in topbar
   &.secondary-nav {