mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-20 17:54:23 +01:00
new navbar introduced to replace topbar
This commit is contained in:
Mark Otto
parent
7c98f1e1fc
commit
8ba005d38d
84
bootstrap.css
vendored
84
bootstrap.css
vendored
@ -6,7 +6,7 @@
|
|||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
||||||
* Date: Sun Oct 9 21:24:37 PDT 2011
|
* Date: Tue Oct 11 09:43:00 PDT 2011
|
||||||
*/
|
*/
|
||||||
/* Reset.less
|
/* Reset.less
|
||||||
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
|
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
|
||||||
@ -1114,26 +1114,37 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
|||||||
/* Patterns.less
|
/* Patterns.less
|
||||||
* Repeatable UI elements outside the base styles provided from the scaffolding
|
* Repeatable UI elements outside the base styles provided from the scaffolding
|
||||||
* ---------------------------------------------------------------------------- */
|
* ---------------------------------------------------------------------------- */
|
||||||
.topbar {
|
.navbar {
|
||||||
height: 40px;
|
height: 40px;
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
z-index: 10000;
|
|
||||||
overflow: visible;
|
overflow: visible;
|
||||||
}
|
}
|
||||||
.topbar a {
|
.navbar-inner {
|
||||||
|
background-color: #222222;
|
||||||
|
background-color: #222222;
|
||||||
|
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
|
||||||
|
background-image: -moz-linear-gradient(top, #333333, #222222);
|
||||||
|
background-image: -ms-linear-gradient(top, #333333, #222222);
|
||||||
|
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
|
||||||
|
background-image: -webkit-linear-gradient(top, #333333, #222222);
|
||||||
|
background-image: -o-linear-gradient(top, #333333, #222222);
|
||||||
|
background-image: linear-gradient(top, #333333, #222222);
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
|
||||||
|
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
|
||||||
|
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
|
||||||
|
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
.navbar a {
|
||||||
color: #bfbfbf;
|
color: #bfbfbf;
|
||||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
||||||
}
|
}
|
||||||
.topbar .brand a:hover, .topbar ul .active > a {
|
.navbar .brand a:hover, .navbar ul .active > a {
|
||||||
background-color: #333;
|
background-color: #333333;
|
||||||
background-color: rgba(255, 255, 255, 0.05);
|
background-color: rgba(255, 255, 255, 0.05);
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
.topbar .brand {
|
.navbar .brand {
|
||||||
float: left;
|
float: left;
|
||||||
display: block;
|
display: block;
|
||||||
padding: 8px 20px 12px;
|
padding: 8px 20px 12px;
|
||||||
@ -1143,20 +1154,21 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
|||||||
font-weight: 200;
|
font-weight: 200;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
}
|
}
|
||||||
.topbar p {
|
.navbar p {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
}
|
}
|
||||||
.topbar p a:hover {
|
.navbar p a:hover {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
.topbar .form-search {
|
.navbar-search {
|
||||||
position: relative;
|
position: relative;
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
|
float: left;
|
||||||
}
|
}
|
||||||
.topbar .form-search input {
|
.navbar-search input {
|
||||||
background-color: #444;
|
background-color: #444;
|
||||||
background-color: rgba(255, 255, 255, 0.3);
|
background-color: rgba(255, 255, 255, 0.3);
|
||||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||||
@ -1179,18 +1191,18 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
|||||||
-o-transition: none;
|
-o-transition: none;
|
||||||
transition: none;
|
transition: none;
|
||||||
}
|
}
|
||||||
.topbar .form-search input:-moz-placeholder {
|
.navbar-search input:-moz-placeholder {
|
||||||
color: #e6e6e6;
|
color: #e6e6e6;
|
||||||
}
|
}
|
||||||
.topbar .form-search input::-webkit-input-placeholder {
|
.navbar-search input::-webkit-input-placeholder {
|
||||||
color: #e6e6e6;
|
color: #e6e6e6;
|
||||||
}
|
}
|
||||||
.topbar .form-search input:hover {
|
.navbar-search input:hover {
|
||||||
background-color: #bfbfbf;
|
background-color: #bfbfbf;
|
||||||
background-color: rgba(255, 255, 255, 0.5);
|
background-color: rgba(255, 255, 255, 0.5);
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
.topbar .form-search input:focus, .topbar .form-search input.focused {
|
.navbar-search input:focus, .navbar-search input.focused {
|
||||||
outline: 0;
|
outline: 0;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: #404040;
|
color: #404040;
|
||||||
@ -1201,24 +1213,24 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
|||||||
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
|
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
|
||||||
box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
|
box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
|
||||||
}
|
}
|
||||||
.topbar .pull-right {
|
.navbar-static {
|
||||||
float: right;
|
margin-bottom: 18px;
|
||||||
}
|
}
|
||||||
.topbar-inner {
|
.navbar-static .navbar-inner {
|
||||||
background-color: #222;
|
margin-left: -20px;
|
||||||
background-color: #222222;
|
margin-right: -20px;
|
||||||
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
|
padding-left: 20px;
|
||||||
background-image: -moz-linear-gradient(top, #333333, #222222);
|
padding-right: 20px;
|
||||||
background-image: -ms-linear-gradient(top, #333333, #222222);
|
-webkit-border-radius: 4px;
|
||||||
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
|
-moz-border-radius: 4px;
|
||||||
background-image: -webkit-linear-gradient(top, #333333, #222222);
|
border-radius: 4px;
|
||||||
background-image: -o-linear-gradient(top, #333333, #222222);
|
}
|
||||||
background-image: linear-gradient(top, #333333, #222222);
|
.navbar-fixed {
|
||||||
background-repeat: repeat-x;
|
position: fixed;
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
|
top: 0;
|
||||||
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
|
left: 0;
|
||||||
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
|
right: 0;
|
||||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
|
z-index: 10000;
|
||||||
}
|
}
|
||||||
.nav {
|
.nav {
|
||||||
display: block;
|
display: block;
|
||||||
|
|||||||
23
bootstrap.min.css
vendored
23
bootstrap.min.css
vendored
@ -199,16 +199,19 @@ table .orange{color:#f89406;border-bottom-color:#f89406;}
|
|||||||
table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;}
|
table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;}
|
||||||
table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
|
table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
|
||||||
table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
|
table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
|
||||||
.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
|
.navbar{height:40px;overflow:visible;}
|
||||||
.topbar .brand a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
|
.navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
|
||||||
.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
|
.navbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
|
||||||
.topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;}
|
.navbar .brand a:hover,.navbar ul .active>a{background-color:#333333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
|
||||||
.topbar .form-search{position:relative;margin-top:5px;margin-bottom:0;}.topbar .form-search input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar .form-search input:-moz-placeholder{color:#e6e6e6;}
|
.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
|
||||||
.topbar .form-search input::-webkit-input-placeholder{color:#e6e6e6;}
|
.navbar p{margin:0;line-height:40px;}.navbar p a:hover{background-color:transparent;color:#ffffff;}
|
||||||
.topbar .form-search input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;}
|
.navbar-search{position:relative;margin-top:5px;margin-bottom:0;float:left;}.navbar-search input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search input:-moz-placeholder{color:#e6e6e6;}
|
||||||
.topbar .form-search input:focus,.topbar .form-search input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
|
.navbar-search input::-webkit-input-placeholder{color:#e6e6e6;}
|
||||||
.topbar .pull-right{float:right;}
|
.navbar-search input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;}
|
||||||
.topbar-inner{background-color:#222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
|
.navbar-search input:focus,.navbar-search input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
|
||||||
|
.navbar-static{margin-bottom:18px;}
|
||||||
|
.navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
|
||||||
|
.navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;}
|
||||||
.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;}
|
.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left: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 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 .active>a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
|
||||||
|
|||||||
@ -37,24 +37,24 @@
|
|||||||
|
|
||||||
<!-- Topbar
|
<!-- Topbar
|
||||||
================================================== -->
|
================================================== -->
|
||||||
<div class="topbar" data-scrollspy="scrollspy">
|
<div class="navbar navbar-fixed" data-scrollspy="scrollspy">
|
||||||
<div class="topbar-inner">
|
<div class="navbar-inner">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<a class="brand" href="#">Bootstrap</a>
|
<a class="brand" href="#">Bootstrap</a>
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="active"><a href="#overview">Overview</a></li>
|
<li class="active"><a href="#overview">Overview</a></li>
|
||||||
<li><a href="#about">About</a></li>
|
<li><a href="#about">About</a></li>
|
||||||
|
|
||||||
<li class="dropdown" data-dropdown="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle">Scaffolding</a>
|
<a href="#" class="dropdown-toggle" data-dropdown="true">Scaffolding</a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li><a href="#grid-system">Grid</a></li>
|
<li><a href="#grid-system">Grid</a></li>
|
||||||
<li><a href="#layouts">Layouts</a></li>
|
<li><a href="#layouts">Layouts</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="dropdown" data-dropdown="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle">CSS</a>
|
<a href="#" class="dropdown-toggle" data-dropdown="true">CSS</a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li><a href="#typography">Type</a></li>
|
<li><a href="#typography">Type</a></li>
|
||||||
<li><a href="#tables">Tables</a></li>
|
<li><a href="#tables">Tables</a></li>
|
||||||
@ -62,8 +62,8 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="dropdown" data-dropdown="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle">Patterns</a>
|
<a href="#" class="dropdown-toggle" data-dropdown="true">Patterns</a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li><a href="#media">Media</a></li>
|
<li><a href="#media">Media</a></li>
|
||||||
<li><a href="#navigation">Navigation</a></li>
|
<li><a href="#navigation">Navigation</a></li>
|
||||||
@ -1258,44 +1258,42 @@
|
|||||||
<h1>Navigation</h1>
|
<h1>Navigation</h1>
|
||||||
</div>
|
</div>
|
||||||
<h2>Fixed topbar</h2>
|
<h2>Fixed topbar</h2>
|
||||||
<div class="topbar-wrapper" style="z-index: 5;">
|
<div class="navbar navbar-static" data-dropdown="dropdown">
|
||||||
<div class="topbar" data-dropdown="dropdown" >
|
<div class="navbar-inner">
|
||||||
<div class="topbar-inner">
|
<div class="container">
|
||||||
<div class="container">
|
<a class="brand" href="#">Project Name</a>
|
||||||
<a class="brand" href="#">Project Name</a>
|
<ul class="nav">
|
||||||
<ul class="nav">
|
<li class="active"><a href="#">Home</a></li>
|
||||||
<li class="active"><a href="#">Home</a></li>
|
<li><a href="#">Link</a></li>
|
||||||
<li><a href="#">Link</a></li>
|
<li><a href="#">Link</a></li>
|
||||||
<li><a href="#">Link</a></li>
|
<li><a href="#">Link</a></li>
|
||||||
<li><a href="#">Link</a></li>
|
<li class="dropdown">
|
||||||
<li class="dropdown">
|
<a href="#" class="dropdown-toggle">Dropdown</a>
|
||||||
<a href="#" class="dropdown-toggle">Dropdown</a>
|
<ul class="dropdown-menu">
|
||||||
<ul class="dropdown-menu">
|
<li><a href="#">Secondary link</a></li>
|
||||||
<li><a href="#">Secondary link</a></li>
|
<li><a href="#">Something else here</a></li>
|
||||||
<li><a href="#">Something else here</a></li>
|
<li class="divider"></li>
|
||||||
<li class="divider"></li>
|
<li><a href="#">Another link</a></li>
|
||||||
<li><a href="#">Another link</a></li>
|
</ul>
|
||||||
</ul>
|
</li>
|
||||||
</li>
|
</ul>
|
||||||
</ul>
|
<form class="form-search navbar-search pull-left" action="">
|
||||||
<form class="form-search pull-left" action="">
|
<input type="text" placeholder="Search">
|
||||||
<input type="text" placeholder="Search" />
|
</form>
|
||||||
</form>
|
<ul class="nav secondary-nav">
|
||||||
<ul class="nav secondary-nav">
|
<li class="dropdown">
|
||||||
<li class="dropdown">
|
<a href="#" class="dropdown-toggle">Dropdown</a>
|
||||||
<a href="#" class="dropdown-toggle">Dropdown</a>
|
<ul class="dropdown-menu">
|
||||||
<ul class="dropdown-menu">
|
<li><a href="#">Secondary link</a></li>
|
||||||
<li><a href="#">Secondary link</a></li>
|
<li><a href="#">Something else here</a></li>
|
||||||
<li><a href="#">Something else here</a></li>
|
<li class="divider"></li>
|
||||||
<li class="divider"></li>
|
<li><a href="#">Another link</a></li>
|
||||||
<li><a href="#">Another link</a></li>
|
</ul>
|
||||||
</ul>
|
</li>
|
||||||
</li>
|
</ul>
|
||||||
</ul>
|
</div>
|
||||||
</div>
|
</div><!-- /topbar-inner -->
|
||||||
</div><!-- /topbar-inner -->
|
</div><!-- /topbar -->
|
||||||
</div><!-- /topbar -->
|
|
||||||
</div><!-- /topbar-wrapper -->
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span5">
|
<div class="span5">
|
||||||
|
|||||||
@ -39,8 +39,8 @@
|
|||||||
|
|
||||||
<!-- Topbar
|
<!-- Topbar
|
||||||
================================================== -->
|
================================================== -->
|
||||||
<div class="topbar" data-scrollspy="scrollspy">
|
<div class="navbar navbar-fixed" data-scrollspy="scrollspy">
|
||||||
<div class="topbar-inner">
|
<div class="navbar-inner">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<a class="brand" href="#">Bootstrap JS</a>
|
<a class="brand" href="#">Bootstrap JS</a>
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
@ -235,39 +235,37 @@ $('#my-modal').bind('hidden', function () {
|
|||||||
A programatic api for activating menus for a given topbar or tabbed navigation.
|
A programatic api for activating menus for a given topbar or tabbed navigation.
|
||||||
</p>
|
</p>
|
||||||
<h3>Demo</h3>
|
<h3>Demo</h3>
|
||||||
<div class="topbar-wrapper">
|
<div id="topbar-example" class="navbar navbar-static">
|
||||||
<div id="topbar-example" class="topbar">
|
<div class="navbar-inner">
|
||||||
<div class="topbar-inner">
|
<div class="container" style="width: auto;">
|
||||||
<div class="container">
|
<a class="brand" href="#">Project Name</a>
|
||||||
<a class="brand" href="#">Project Name</a>
|
<ul class="nav">
|
||||||
<ul class="nav">
|
<li><a href="#">Link</a></li>
|
||||||
<li><a href="#">Link</a></li>
|
<li><a href="#">Link</a></li>
|
||||||
<li><a href="#">Link</a></li>
|
</ul>
|
||||||
</ul>
|
<form action="" class="search-form navbar-search">
|
||||||
<form action="">
|
<input type="text" placeholder="Search">
|
||||||
<input type="text" placeholder="Search" />
|
</form>
|
||||||
</form>
|
<ul class="nav secondary-nav">
|
||||||
<ul class="nav secondary-nav">
|
<li class="dropdown">
|
||||||
<li class="dropdown">
|
<a href="#" class="dropdown-toggle" data-dropdown="true">Dropdown 1</a>
|
||||||
<a href="#" class="dropdown-toggle" data-dropdown="true">Dropdown 1</a>
|
<ul class="dropdown-menu">
|
||||||
<ul class="dropdown-menu">
|
<li><a href="#">Secondary link</a></li>
|
||||||
<li><a href="#">Secondary link</a></li>
|
<li><a href="#">Something else here</a></li>
|
||||||
<li><a href="#">Something else here</a></li>
|
<li class="divider"></li>
|
||||||
<li class="divider"></li>
|
<li><a href="#">Another link</a></li>
|
||||||
<li><a href="#">Another link</a></li>
|
</ul>
|
||||||
</ul>
|
</li>
|
||||||
</li>
|
<li class="dropdown">
|
||||||
<li class="dropdown">
|
<a href="#" class="dropdown-toggle" data-dropdown="true">Dropdown 2</a>
|
||||||
<a href="#" class="dropdown-toggle" data-dropdown="true">Dropdown 2</a>
|
<ul class="dropdown-menu">
|
||||||
<ul class="dropdown-menu">
|
<li><a href="#">Secondary link</a></li>
|
||||||
<li><a href="#">Secondary link</a></li>
|
<li><a href="#">Something else here</a></li>
|
||||||
<li><a href="#">Something else here</a></li>
|
<li class="divider"></li>
|
||||||
<li class="divider"></li>
|
<li><a href="#">Another link</a></li>
|
||||||
<li><a href="#">Another link</a></li>
|
</ul>
|
||||||
</ul>
|
</li>
|
||||||
</li>
|
</ul>
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -3,34 +3,41 @@
|
|||||||
* ---------------------------------------------------------------------------- */
|
* ---------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
|
||||||
// TOPBAR
|
// NAVBAR (FIXED AND STATIC)
|
||||||
// ------
|
// -------------------------
|
||||||
|
|
||||||
// Topbar for Branding and Nav
|
// Navbar variables
|
||||||
.topbar {
|
@navBarHeight: 40px;
|
||||||
height: 40px;
|
@navBarBgStart: #333;
|
||||||
position: fixed;
|
@navBarBgEnd: #222;
|
||||||
top: 0;
|
|
||||||
left: 0;
|
// Common styles
|
||||||
right: 0;
|
.navbar {
|
||||||
z-index: 10000;
|
height: @navBarHeight;
|
||||||
overflow: visible;
|
overflow: visible;
|
||||||
|
}
|
||||||
// Links get text shadow
|
// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
|
||||||
|
.navbar-inner {
|
||||||
|
background-color: @navBarBgEnd;
|
||||||
|
#gradient > .vertical(@navBarBgStart, @navBarBgEnd);
|
||||||
|
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
|
||||||
|
.box-shadow(@shadow);
|
||||||
|
}
|
||||||
|
// Text and links
|
||||||
|
.navbar {
|
||||||
|
// Links get text-shadow
|
||||||
a {
|
a {
|
||||||
color: @grayLight;
|
color: @grayLight;
|
||||||
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hover and active states
|
// Hover and active states
|
||||||
.brand a:hover,
|
.brand a:hover,
|
||||||
ul .active > a {
|
ul .active > a {
|
||||||
background-color: #333;
|
background-color: @navBarBgStart;
|
||||||
background-color: rgba(255,255,255,.05);
|
background-color: rgba(255,255,255,.05);
|
||||||
color: @white;
|
color: @white;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Website or project name
|
// Website or project name
|
||||||
.brand {
|
.brand {
|
||||||
float: left;
|
float: left;
|
||||||
@ -42,7 +49,6 @@
|
|||||||
font-weight: 200;
|
font-weight: 200;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Plain text in topbar
|
// Plain text in topbar
|
||||||
p {
|
p {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@ -52,70 +58,82 @@
|
|||||||
color: @white;
|
color: @white;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Search Form
|
// Navbar search
|
||||||
.form-search {
|
.navbar-search {
|
||||||
position: relative;
|
position: relative;
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
input {
|
float: left;
|
||||||
background-color: #444;
|
input {
|
||||||
background-color: rgba(255,255,255,.3);
|
background-color: #444;
|
||||||
#font > .sans-serif(13px, normal, 1);
|
background-color: rgba(255,255,255,.3);
|
||||||
padding: 4px 9px;
|
#font > .sans-serif(13px, normal, 1);
|
||||||
|
padding: 4px 9px;
|
||||||
|
color: @white;
|
||||||
|
color: rgba(255,255,255,.75);
|
||||||
|
border: 1px solid #111;
|
||||||
|
.border-radius(4px);
|
||||||
|
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
|
||||||
|
.box-shadow(@shadow);
|
||||||
|
.transition(none);
|
||||||
|
|
||||||
|
// Placeholder text gets special styles; can't be bundled together though for some reason
|
||||||
|
&:-moz-placeholder {
|
||||||
|
color: @grayLighter;
|
||||||
|
}
|
||||||
|
&::-webkit-input-placeholder {
|
||||||
|
color: @grayLighter;
|
||||||
|
}
|
||||||
|
// Hover states
|
||||||
|
&:hover {
|
||||||
|
background-color: @grayLight;
|
||||||
|
background-color: rgba(255,255,255,.5);
|
||||||
color: @white;
|
color: @white;
|
||||||
color: rgba(255,255,255,.75);
|
}
|
||||||
border: 1px solid #111;
|
// Focus states (we use .focused since IE8 and down doesn't support :focus)
|
||||||
.border-radius(4px);
|
&:focus,
|
||||||
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
|
&.focused {
|
||||||
.box-shadow(@shadow);
|
outline: 0;
|
||||||
.transition(none);
|
background-color: @white;
|
||||||
|
color: @grayDark;
|
||||||
// Placeholder text gets special styles; can't be bundled together though for some reason
|
text-shadow: 0 1px 0 @white;
|
||||||
&:-moz-placeholder {
|
border: 0;
|
||||||
color: @grayLighter;
|
padding: 5px 10px;
|
||||||
}
|
.box-shadow(0 0 3px rgba(0,0,0,.15));
|
||||||
&::-webkit-input-placeholder {
|
|
||||||
color: @grayLighter;
|
|
||||||
}
|
|
||||||
// Hover states
|
|
||||||
&:hover {
|
|
||||||
background-color: @grayLight;
|
|
||||||
background-color: rgba(255,255,255,.5);
|
|
||||||
color: @white;
|
|
||||||
}
|
|
||||||
// Focus states (we use .focused since IE8 and down doesn't support :focus)
|
|
||||||
&:focus,
|
|
||||||
&.focused {
|
|
||||||
outline: 0;
|
|
||||||
background-color: @white;
|
|
||||||
color: @grayDark;
|
|
||||||
text-shadow: 0 1px 0 @white;
|
|
||||||
border: 0;
|
|
||||||
padding: 5px 10px;
|
|
||||||
.box-shadow(0 0 3px rgba(0,0,0,.15));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Todo: remove from v2.0 when ready, added for legacy
|
|
||||||
.pull-right {
|
|
||||||
float: right;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
|
|
||||||
.topbar-inner {
|
// Static navbar
|
||||||
background-color: #222;
|
.navbar-static {
|
||||||
#gradient > .vertical(#333, #222);
|
margin-bottom: @baseLineHeight;
|
||||||
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
|
|
||||||
.box-shadow(@shadow);
|
|
||||||
}
|
}
|
||||||
|
.navbar-static .navbar-inner {
|
||||||
|
margin-left: -20px;
|
||||||
|
margin-right: -20px;
|
||||||
|
padding-left: 20px;
|
||||||
|
padding-right: 20px;
|
||||||
|
.border-radius(4px);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fixed navbar
|
||||||
|
.navbar-fixed {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
z-index: 10000;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// NAVIGATION
|
// NAVIGATION
|
||||||
// ----------
|
// ----------
|
||||||
|
|
||||||
// Topbar Nav
|
// Nav for navbar and topbar
|
||||||
// ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
|
// ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
|
||||||
.nav {
|
.nav {
|
||||||
display: block;
|
display: block;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user