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.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.css')
| -rw-r--r-- | bootstrap.css | 10 |
1 files changed, 9 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; |