rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Code Issues Actions Packages Releases Activity

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
Show Stats 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;

1
bootstrap.min.css vendored
View File

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

1
docs/components.html
View File

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

9
lib/patterns.less
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 {