rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto 2011-12-11 00:58:10 -08:00
commit 6de3ed5322
4 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bootstrap.css vendored
View file

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