Skip to content

B
bootstrap
Commit 6662f622 authored by Mark Otto's avatar Mark Otto
Browse files
Options

remove subnav file, instead add an optional class for .navbar

parent 87af5d3b
Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 356 deletions
docs/assets/css/bootstrap-responsive.css
View file @ 6662f622
...@@ -1004,4 +1004,31 @@ ...@@ -1004,4 +1004,31 @@
height: auto !important; height: auto !important;
overflow: visible !important; overflow: visible !important;
} }
.subnav-fixed {
position: fixed;
top: 40px;
right: 0;
left: 0;
z-index: 1020;
border-color: #d5d5d5;
border-width: 0 0 1px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
}
.subnav-fixed .nav {
max-width: 780px;
padding: 0 1px;
margin: 0 auto;
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
} }
docs/assets/css/bootstrap.css
View file @ 6662f622
...@@ -4172,122 +4172,48 @@ input[type="submit"].btn.btn-mini { ...@@ -4172,122 +4172,48 @@ input[type="submit"].btn.btn-mini {
left: auto; left: auto;
} }
/* Subnav /* Subnav navbar
-------------------------------------------------- */ -------------------------------------------------- */
/* Base .navbar-subnav {
------------------------- */
.subnav {
width: 100%;
height: 36px; height: 36px;
background-color: #f2f2f2;
background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee);
background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#eeeeee));
background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee);
background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee);
background-image: linear-gradient(top, #f5f5f5, #eeeeee);
background-repeat: repeat-x;
border: 1px solid #e5e5e5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffeeeeee', GradientType=0);
}
/* Nav links
------------------------- */
.subnav .nav {
margin-bottom: 0;
}
.subnav .nav > li {
float: left;
}
.subnav .nav > li > a {
padding: 9px 12px;
line-height: 18px;
border-right: 1px solid #e5e5e5;
border-left: 1px solid #f5f5f5;
}
.subnav .nav > .active > a,
.subnav .nav > .active > a:hover {
padding-left: 13px;
color: #777;
background-color: #e9e9e9;
border-left: 0;
border-right-color: #ddd;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
padding-left: 12px;
border-left: 0;
-webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
} }
.subnav .nav > li:last-child > a { .navbar-subnav .navbar-inner {
border-right: 0; min-height: 36px;
padding: 0;
background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #f9f9f9, #eeeeee);
background-image: -ms-linear-gradient(top, #f9f9f9, #eeeeee);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#eeeeee));
background-image: -webkit-linear-gradient(top, #f9f9f9, #eeeeee);
background-image: -o-linear-gradient(top, #f9f9f9, #eeeeee);
background-image: linear-gradient(top, #f9f9f9, #eeeeee);
background-repeat: repeat-x;
border: 1px solid #e5e5e5;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#ffeeeeee', GradientType=0);
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
} }
/* Reposition the dropdown carets */ .navbar-subnav .nav > li > a {
color: #0088cc;
.subnav .nav .dropdown-toggle .caret { text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
margin-top: 7px;
} }
.nav .active .dropdown-toggle .caret { .navbar-subnav .nav > li > a:hover {
border-top-color: #777; color: #005580;
border-bottom-color: #777;
} }
/* Dropdown menus get matching border-radius */ .navbar-subnav .nav li.dropdown .dropdown-toggle .caret,
.navbar-subnav .nav li.dropdown.open .caret {
.subnav .dropdown-menu { border-top-color: #0088cc;
-webkit-border-radius: 0 0 4px 4px; border-bottom-color: #0088cc;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
} }
/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */ .navbar-subnav .nav .open > a {
color: #005580;
@media (min-width: 980px) {
.subnav-fixed {
position: fixed;
top: 40px;
right: 0;
left: 0;
z-index: 1020;
border-color: #d5d5d5;
border-width: 0 0 1px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
}
.subnav-fixed .nav {
max-width: 780px;
padding: 0 1px;
margin: 0 auto;
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
} }
.breadcrumb { .breadcrumb {
......
docs/base-css.html
View file @ 6662f622
...@@ -80,15 +80,17 @@ ...@@ -80,15 +80,17 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Base CSS</h1> <h1>Base CSS</h1>
<p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p> <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#typography">Typography</a></li> <ul class="nav">
<li><a href="#code">Code</a></li> <li><a href="#typography">Typography</a></li>
<li><a href="#tables">Tables</a></li> <li><a href="#code">Code</a></li>
<li><a href="#forms">Forms</a></li> <li><a href="#tables">Tables</a></li>
<li><a href="#buttons">Buttons</a></li> <li><a href="#forms">Forms</a></li>
<li><a href="#icons">Icons by Glyphicons</a></li> <li><a href="#buttons">Buttons</a></li>
</ul> <li><a href="#icons">Icons by Glyphicons</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/components.html
View file @ 6662f622
...@@ -80,33 +80,35 @@ ...@@ -80,33 +80,35 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Components</h1> <h1>Components</h1>
<p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p> <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#dropdowns">Dropdowns</a></li> <ul class="nav">
<li class="dropdown"> <li><a href="#dropdowns">Dropdowns</a></li>
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Buttons <b class="caret"></b></a> <li class="dropdown">
<ul class="dropdown-menu"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">Buttons <b class="caret"></b></a>
<li><a href="#buttonGroups">Button groups</a></li> <ul class="dropdown-menu">
<li><a href="#buttonDropdowns">Button dropdowns</a></li> <li><a href="#buttonGroups">Button groups</a></li>
</ul> <li><a href="#buttonDropdowns">Button dropdowns</a></li>
</li> </ul>
<li class="dropdown"> </li>
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Nav <b class="caret"></b></a> <li class="dropdown">
<ul class="dropdown-menu"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">Nav <b class="caret"></b></a>
<li><a href="#navs">Nav, tabs, pills</a></li> <ul class="dropdown-menu">
<li><a href="#navbar">Navbar</a></li> <li><a href="#navs">Nav, tabs, pills</a></li>
<li><a href="#breadcrumbs">Breadcrumbs</a></li> <li><a href="#navbar">Navbar</a></li>
<li><a href="#pagination">Pagination</a></li> <li><a href="#breadcrumbs">Breadcrumbs</a></li>
</ul> <li><a href="#pagination">Pagination</a></li>
</li> </ul>
<li><a href="#labels">Labels</a></li> </li>
<li><a href="#badges">Badges</a></li> <li><a href="#labels">Labels</a></li>
<li><a href="#typography">Typography</a></li> <li><a href="#badges">Badges</a></li>
<li><a href="#thumbnails">Thumbnails</a></li> <li><a href="#typography">Typography</a></li>
<li><a href="#alerts">Alerts</a></li> <li><a href="#thumbnails">Thumbnails</a></li>
<li><a href="#progress">Progress bars</a></li> <li><a href="#alerts">Alerts</a></li>
<li><a href="#misc">Misc</a></li> <li><a href="#progress">Progress bars</a></li>
</ul> <li><a href="#misc">Misc</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/download.html
View file @ 6662f622
...@@ -80,13 +80,15 @@ ...@@ -80,13 +80,15 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Customize and download</h1> <h1>Customize and download</h1>
<p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.</p> <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#components">1. Choose components</a></li> <ul class="nav">
<li><a href="#plugins">2. Select jQuery plugins</a></li> <li><a href="#components">1. Choose components</a></li>
<li><a href="#variables">3. Customize variables</a></li> <li><a href="#plugins">2. Select jQuery plugins</a></li>
<li><a href="#download">4. Download</a></li> <li><a href="#variables">3. Customize variables</a></li>
</ul> <li><a href="#download">4. Download</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/javascript.html
View file @ 6662f622
...@@ -80,21 +80,24 @@ ...@@ -80,21 +80,24 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Javascript for Bootstrap</h1> <h1>Javascript for Bootstrap</h1>
<p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins. <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#transitions">Transitions</a></li> <ul class="nav">
<li><a href="#modals">Modal</a></li> <li><a href="#transitions">Transitions</a></li>
<li><a href="#dropdowns">Dropdown</a></li> <li><a href="#modals">Modal</a></li>
<li><a href="#scrollspy">Scrollspy</a></li> <li><a href="#dropdowns">Dropdown</a></li>
<li><a href="#tabs">Tab</a></li> <li><a href="#scrollspy">Scrollspy</a></li>
<li><a href="#tooltips">Tooltip</a></li> <li><a href="#tabs">Tab</a></li>
<li><a href="#popovers">Popover</a></li> <li><a href="#tooltips">Tooltip</a></li>
<li><a href="#alerts">Alert</a></li> <li><a href="#popovers">Popover</a></li>
<li><a href="#buttons">Button</a></li> <li><a href="#alerts">Alert</a></li>
<li><a href="#collapse">Collapse</a></li> <li><a href="#buttons">Button</a></li>
<li><a href="#carousel">Carousel</a></li> <li><a href="#collapse">Collapse</a></li>
<li><a href="#typeahead">Typeahead</a></li> <li><a href="#carousel">Carousel</a></li>
</ul> <li><a href="#typeahead">Typeahead</a></li>
<li><a href="#affix">Affix</a></li>
</ul>
</div>
</div> </div>
</header> </header>
...@@ -1512,6 +1515,28 @@ $('.carousel').carousel({ ...@@ -1512,6 +1515,28 @@ $('.carousel').carousel({
</section> </section>
<!-- Affix
================================================== -->
<section id="affix">
<div class="page-header">
<h1>
Affix
<small>Make an element stick in place</small>
</h1>
</div>
<h2>...</h2>
<p>...</p>
<div class="bs-docs-example">
</div>
<pre class="prettyprint linenums">
...
</pre>
</section>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
......
docs/less.html
View file @ 6662f622
...@@ -80,13 +80,15 @@ ...@@ -80,13 +80,15 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Using LESS with Bootstrap</h1> <h1>Using LESS with Bootstrap</h1>
<p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p> <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#builtWith">Built with Less</a></li> <ul class="nav">
<li><a href="#variables">Variables</a></li> <li><a href="#builtWith">Built with Less</a></li>
<li><a href="#mixins">Mixins</a></li> <li><a href="#variables">Variables</a></li>
<li><a href="#compiling">Compiling Bootstrap</a></li> <li><a href="#mixins">Mixins</a></li>
</ul> <li><a href="#compiling">Compiling Bootstrap</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/scaffolding.html
View file @ 6662f622
...@@ -80,15 +80,17 @@ ...@@ -80,15 +80,17 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Scaffolding</h1> <h1>Scaffolding</h1>
<p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p> <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#global">Global styles</a></li> <ul class="nav">
<li><a href="#gridSystem">Grid system</a></li> <li><a href="#global">Global styles</a></li>
<li><a href="#fluidGridSystem">Fluid grid system</a></li> <li><a href="#gridSystem">Grid system</a></li>
<li><a href="#gridCustomization">Customizing</a></li> <li><a href="#fluidGridSystem">Fluid grid system</a></li>
<li><a href="#layouts">Layouts</a></li> <li><a href="#gridCustomization">Customizing</a></li>
<li><a href="#responsive">Responsive design</a></li> <li><a href="#layouts">Layouts</a></li>
</ul> <li><a href="#responsive">Responsive design</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/templates/pages/base-css.mustache
View file @ 6662f622
...@@ -3,15 +3,17 @@ ...@@ -3,15 +3,17 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>{{_i}}Base CSS{{/i}}</h1> <h1>{{_i}}Base CSS{{/i}}</h1>
<p class="lead">{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}</p> <p class="lead">{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#typography">{{_i}}Typography{{/i}}</a></li> <ul class="nav">
<li><a href="#code">{{_i}}Code{{/i}}</a></li> <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
<li><a href="#tables">{{_i}}Tables{{/i}}</a></li> <li><a href="#code">{{_i}}Code{{/i}}</a></li>
<li><a href="#forms">{{_i}}Forms{{/i}}</a></li> <li><a href="#tables">{{_i}}Tables{{/i}}</a></li>
<li><a href="#buttons">{{_i}}Buttons{{/i}}</a></li> <li><a href="#forms">{{_i}}Forms{{/i}}</a></li>
<li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li> <li><a href="#buttons">{{_i}}Buttons{{/i}}</a></li>
</ul> <li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/templates/pages/components.mustache
View file @ 6662f622
...@@ -3,33 +3,35 @@ ...@@ -3,33 +3,35 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>{{_i}}Components{{/i}}</h1> <h1>{{_i}}Components{{/i}}</h1>
<p class="lead">{{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}</p> <p class="lead">{{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#dropdowns">{{_i}}Dropdowns{{/i}}</a></li> <ul class="nav">
<li class="dropdown"> <li><a href="#dropdowns">{{_i}}Dropdowns{{/i}}</a></li>
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a> <li class="dropdown">
<ul class="dropdown-menu"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a>
<li><a href="#buttonGroups">{{_i}}Button groups{{/i}}</a></li> <ul class="dropdown-menu">
<li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li> <li><a href="#buttonGroups">{{_i}}Button groups{{/i}}</a></li>
</ul> <li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li>
</li> </ul>
<li class="dropdown"> </li>
<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Nav{{/i}} <b class="caret"></b></a> <li class="dropdown">
<ul class="dropdown-menu"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Nav{{/i}} <b class="caret"></b></a>
<li><a href="#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li> <ul class="dropdown-menu">
<li><a href="#navbar">{{_i}}Navbar{{/i}}</a></li> <li><a href="#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li>
<li><a href="#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li> <li><a href="#navbar">{{_i}}Navbar{{/i}}</a></li>
<li><a href="#pagination">{{_i}}Pagination{{/i}}</a></li> <li><a href="#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li>
</ul> <li><a href="#pagination">{{_i}}Pagination{{/i}}</a></li>
</li> </ul>
<li><a href="#labels">{{_i}}Labels{{/i}}</a></li> </li>
<li><a href="#badges">{{_i}}Badges{{/i}}</a></li> <li><a href="#labels">{{_i}}Labels{{/i}}</a></li>
<li><a href="#typography">{{_i}}Typography{{/i}}</a></li> <li><a href="#badges">{{_i}}Badges{{/i}}</a></li>
<li><a href="#thumbnails">{{_i}}Thumbnails{{/i}}</a></li> <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
<li><a href="#alerts">{{_i}}Alerts{{/i}}</a></li> <li><a href="#thumbnails">{{_i}}Thumbnails{{/i}}</a></li>
<li><a href="#progress">{{_i}}Progress bars{{/i}}</a></li> <li><a href="#alerts">{{_i}}Alerts{{/i}}</a></li>
<li><a href="#misc">{{_i}}Misc{{/i}}</a></li> <li><a href="#progress">{{_i}}Progress bars{{/i}}</a></li>
</ul> <li><a href="#misc">{{_i}}Misc{{/i}}</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/templates/pages/download.mustache
View file @ 6662f622
...@@ -3,13 +3,15 @@ ...@@ -3,13 +3,15 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>{{_i}}Customize and download{{/i}}</h1> <h1>{{_i}}Customize and download{{/i}}</h1>
<p class="lead">{{_i}}<a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}</p> <p class="lead">{{_i}}<a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li> <ul class="nav">
<li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li> <li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
<li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li> <li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
<li><a href="#download">{{_i}}4. Download{{/i}}</a></li> <li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
</ul> <li><a href="#download">{{_i}}4. Download{{/i}}</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/templates/pages/javascript.mustache
View file @ 6662f622
...@@ -3,21 +3,24 @@ ...@@ -3,21 +3,24 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>{{_i}}Javascript for Bootstrap{{/i}}</h1> <h1>{{_i}}Javascript for Bootstrap{{/i}}</h1>
<p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.{{/i}} <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.{{/i}}
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#transitions">{{_i}}Transitions{{/i}}</a></li> <ul class="nav">
<li><a href="#modals">{{_i}}Modal{{/i}}</a></li> <li><a href="#transitions">{{_i}}Transitions{{/i}}</a></li>
<li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li> <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
<li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li> <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
<li><a href="#tabs">{{_i}}Tab{{/i}}</a></li> <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
<li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li> <li><a href="#tabs">{{_i}}Tab{{/i}}</a></li>
<li><a href="#popovers">{{_i}}Popover{{/i}}</a></li> <li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li>
<li><a href="#alerts">{{_i}}Alert{{/i}}</a></li> <li><a href="#popovers">{{_i}}Popover{{/i}}</a></li>
<li><a href="#buttons">{{_i}}Button{{/i}}</a></li> <li><a href="#alerts">{{_i}}Alert{{/i}}</a></li>
<li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li> <li><a href="#buttons">{{_i}}Button{{/i}}</a></li>
<li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li> <li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li>
<li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li> <li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li>
</ul> <li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
<li><a href="#affix">{{_i}}Affix{{/i}}</a></li>
</ul>
</div>
</div> </div>
</header> </header>
...@@ -1435,3 +1438,25 @@ $('.carousel').carousel({ ...@@ -1435,3 +1438,25 @@ $('.carousel').carousel({
<h4>.typeahead({{_i}}options{{/i}})</h4> <h4>.typeahead({{_i}}options{{/i}})</h4>
<p>{{_i}}Initializes an input with a typeahead.{{/i}}</p> <p>{{_i}}Initializes an input with a typeahead.{{/i}}</p>
</section> </section>
<!-- Affix
================================================== -->
<section id="affix">
<div class="page-header">
<h1>
{{_i}}Affix{{/i}}
<small>{{_i}}Make an element stick in place{{/i}}</small>
</h1>
</div>
<h2>{{_i}}...{{/i}}</h2>
<p>{{_i}}...{{/i}}</p>
<div class="bs-docs-example">
</div>
<pre class="prettyprint linenums">
...
</pre>
</section>
docs/templates/pages/less.mustache
View file @ 6662f622
...@@ -3,13 +3,15 @@ ...@@ -3,13 +3,15 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1> <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1>
<p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p> <p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li> <ul class="nav">
<li><a href="#variables">{{_i}}Variables{{/i}}</a></li> <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
<li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li> <li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
<li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li> <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
</ul> <li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
docs/templates/pages/scaffolding.mustache
View file @ 6662f622
...@@ -3,15 +3,17 @@ ...@@ -3,15 +3,17 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>{{_i}}Scaffolding{{/i}}</h1> <h1>{{_i}}Scaffolding{{/i}}</h1>
<p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p> <p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
<div class="subnav"> <div class="navbar navbar-subnav">
<ul class="nav"> <div class="navbar-inner">
<li><a href="#global">{{_i}}Global styles{{/i}}</a></li> <ul class="nav">
<li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li> <li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
<li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li> <li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
<li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li> <li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
<li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li> <li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
<li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li> <li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
</ul> <li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
</ul>
</div>
</div> </div>
</header> </header>
......
less/bootstrap.less
View file @ 6662f622
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
// Components: Nav // Components: Nav
@import "navs.less"; @import "navs.less";
@import "navbar.less"; @import "navbar.less";
@import "subnav.less";
@import "breadcrumbs.less"; @import "breadcrumbs.less";
@import "pagination.less"; @import "pagination.less";
@import "pager.less"; @import "pager.less";
......
less/navbar.less
View file @ 6662f622
...@@ -362,3 +362,46 @@ ...@@ -362,3 +362,46 @@
right: 13px; right: 13px;
} }
} }
/* Subnav navbar
-------------------------------------------------- */
// In the future, we may make two options available for the navbar:
// a default state, the lighter one, and the darker one as an option
// to enable. This would prevent some overriding back to defaults.
// Override the default .navbar
.navbar-subnav {
height: 36px;
}
.navbar-subnav .navbar-inner {
min-height: 36px;
padding: 0;
#gradient > .vertical(#f9f9f9, #eeeeee);
.box-shadow(none);
border: 1px solid #e5e5e5;
}
// Change link colors back
.navbar-subnav .nav > li > a {
color: @linkColor;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
}
.navbar-subnav .nav > li > a:hover {
color: @linkColorHover;
}
// Dropdown carets
.navbar-subnav .nav li.dropdown .dropdown-toggle .caret,
.navbar-subnav .nav li.dropdown.open .caret {
border-top-color: @linkColor;
border-bottom-color: @linkColor;
}
// Open dropdown dropdown-toggle
.navbar-subnav .nav .open > a {
color: @linkColorHover;
}
less/responsive-navbar.less
View file @ 6662f622
...@@ -144,10 +144,41 @@ ...@@ -144,10 +144,41 @@
// DEFAULT DESKTOP // DEFAULT DESKTOP
// --------------- // ---------------
// Required to make the collapsing navbar work on regular desktops
@media (min-width: 980px) { @media (min-width: 980px) {
// Required to make the collapsing navbar work on regular desktops
.nav-collapse.collapse { .nav-collapse.collapse {
height: auto !important; height: auto !important;
overflow: visible !important; overflow: visible !important;
} }
}
\ No newline at end of file // Fixed subnav on scroll, but only for 980px and up (sorry IE!)
.subnav-fixed {
position: fixed;
top: 40px;
left: 0;
right: 0;
z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
border-color: #d5d5d5;
border-width: 0 0 1px; /* drop the border on the fixed edges */
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
}
.subnav-fixed .nav {
max-width: 780px;
margin: 0 auto;
padding: 0 1px;
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
}
less/subnav.less deleted 100644 → 0
View file @ 87af5d3b
/* Subnav
-------------------------------------------------- */
/* Base
------------------------- */
.subnav {
width: 100%;
height: 36px;
#gradient > .vertical(#f5f5f5, #eeeeee);
border: 1px solid #e5e5e5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
/* Nav links
------------------------- */
.subnav .nav {
margin-bottom: 0; // remove default bottom margin of .nav
}
// Make list items appear inline
.subnav .nav > li {
float: left;
}
.subnav .nav > li > a {
padding: 9px 12px;
line-height: 18px;
border-left: 1px solid #f5f5f5;
border-right: 1px solid #e5e5e5;
}
.subnav .nav > .active > a,
.subnav .nav > .active > a:hover {
padding-left: 13px;
color: #777;
background-color: #e9e9e9;
border-right-color: #ddd;
border-left: 0;
-webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
border-left: 0;
padding-left: 12px;
-webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
}
.subnav .nav > li:last-child > a {
border-right: 0;
}
/* Reposition the dropdown carets */
.subnav .nav .dropdown-toggle .caret {
margin-top: 7px;
}
.nav .active .dropdown-toggle .caret {
border-top-color: #777;
border-bottom-color: #777;
}
/* Dropdown menus get matching border-radius */
.subnav .dropdown-menu {
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
}
/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
@media (min-width: 980px) {
.subnav-fixed {
position: fixed;
top: 40px;
left: 0;
right: 0;
z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
border-color: #d5d5d5;
border-width: 0 0 1px; /* drop the border on the fixed edges */
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
}
.subnav-fixed .nav {
max-width: 780px;
margin: 0 auto;
padding: 0 1px;
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment