1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00

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

Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2011-12-11 00:58:10 -08:00
4 changed files with 20 additions and 1 deletions

View File

@@ -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 {