aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Meagher <[email protected]>2011-12-02 11:37:39 -0800
committerEvan Meagher <[email protected]>2011-12-02 11:37:39 -0800
commit6e70d490e1c189518164d7f08035c34e21745715 (patch)
tree1ab87f9e649e0c79b6773213feb8e6b9802c0817
parent3726df695eedecee323920305cb5d486a787acd6 (diff)
downloadbootstrap-6e70d490e1c189518164d7f08035c34e21745715.tar.xz
bootstrap-6e70d490e1c189518164d7f08035c34e21745715.zip
Add vertical nav divider example in components doc page.
-rw-r--r--bootstrap.css10
-rw-r--r--bootstrap.min.css1
-rw-r--r--docs/components.html1
3 files changed, 11 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css
index afd87d137..977737f67 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: Wed Nov 30 22:05:44 PST 2011
+ * Date: Fri Dec 2 11:32:48 PST 2011
*/
html, body {
margin: 0;
@@ -1313,6 +1313,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 d8ee06c15..37e966784 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -189,6 +189,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 833f532d9..ba9542fdb 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">