diff options
| author | Mark Otto <[email protected]> | 2011-12-11 00:58:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-11 00:58:10 -0800 |
| commit | 6de3ed53228c79bc4fde5086d1302f2367bc40a5 (patch) | |
| tree | d3dfa15bd3a458747048e43d685e1af275de1db0 /bootstrap.min.css | |
| parent | 200fe25d0a3b5391ecfd8385142bfdbd318f747c (diff) | |
| parent | 6e70d490e1c189518164d7f08035c34e21745715 (diff) | |
| download | bootstrap-6de3ed53228c79bc4fde5086d1302f2367bc40a5.tar.xz bootstrap-6de3ed53228c79bc4fde5086d1302f2367bc40a5.zip | |
Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider
Conflicts:
bootstrap.css
Diffstat (limited to 'bootstrap.min.css')
| -rw-r--r-- | bootstrap.min.css | 1 |
1 files changed, 1 insertions, 0 deletions
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);} |