Skip to content

B
bootstrap
Commit 081c0612 authored by Mark Otto's avatar Mark Otto
Browse files
Options

new subnav on all pages

parent fe414d85
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 282 deletions
docs/assets/css/docs.css
View file @ 081c0612
......@@ -15,6 +15,7 @@ body {
}
.bs-docs-container {
max-width: 860px;
padding-left: 15px;
padding-right: 15px;
}
......@@ -49,32 +50,23 @@ section > ul li {
/* Navbar
-------------------------------------------------- */
/*.bs-docs-navbar {
background-color: #fff;
border-bottom: 1px solid #ccc;
border-bottom: 1px solid rgba(0,0,0,.1);
}
.bs-docs-navbar .nav > .active > a,
.bs-docs-navbar .nav > .active > a:hover {
font-weight: 500;
background-color: transparent;
.bs-docs-navbar {
background-color: #333;
}
*/
.bs-docs-navbar .navbar-brand {
padding: 15px;
font-size: 32px;
font-size: 30px;
margin-left: 0;
}
.bs-docs-navbar .nav {
border-top: 1px solid #111;
border-bottom: 1px solid #333;
border-top: 1px solid #222;
border-bottom: 1px solid #444;
}
.bs-docs-navbar .nav > li > a {
width: 60px;
text-align: center;
border-top: 1px solid #333;
border-bottom: 1px solid #111;
border-top: 1px solid #444;
border-bottom: 1px solid #222;
}
.bs-docs-navbar .glyphicon {
display: block;
......@@ -202,6 +194,53 @@ section > ul li {
/* Sidenav
-------------------------------------------------- */
.bs-docs-sidebar {
position: fixed;
top: 0;
left: 60px;
bottom: 0;
width: 240px;
background-color: #f5f5f5;
border-right: 1px solid #e5e5e5;
}
.bs-docs-sidenav > li > a {
color: #555;
padding: 8px 20px;
}
.bs-docs-sidenav > .active > a,
.bs-docs-sidenav > .active:hover > a,
.bs-docs-sidenav > .active:focus > a {
color: #fff;
background-color: #428bca;
}
.bs-docs-sidenav-heading {
margin: 0;
padding: 15px 20px;
color: #999;
border-bottom: 1px solid #e5e5e5;
box-shadow: 0 1px 0 #fff;
}
.bs-docs-navbar:after,
.bs-docs-sidebar:after {
position: absolute;
top: -20px;
right: 0;
bottom: -20px;
left: -10px;
z-index: 10;
display: block;
content: " ";
box-shadow: inset -5px 0 25px rgba(0,0,0,.05);
}
.bs-docs-navbar .container,
.bs-docs-sidenav {
position: relative;
z-index: 15;
}
/* Base styles are not affixable given mobile-first */
.bs-docs-sidenav {
margin: 0;
......@@ -209,13 +248,13 @@ section > ul li {
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.bs-docs-sidenav.affix {
/*.bs-docs-sidenav.affix {
position: static;
top: 0;
}
}*/
/* Chevrons within each link */
.bs-docs-sidenav .glyphicon-chevron-right {
/*.bs-docs-sidenav .glyphicon-chevron-right {
float: right;
margin-top: 1px;
margin-right: -6px;
......@@ -230,7 +269,7 @@ section > ul li {
color: #fff;
opacity: 1;
}
*/
/* Bootstrap code examples
......@@ -638,7 +677,7 @@ input.focused {
body {
/*padding-top: 50px;*/ /* Default height of navbar */
padding-top: 0;
padding-left: 60px;
padding-left: 300px;
}
/* Undo custom padding */
......@@ -690,13 +729,13 @@ input.focused {
}
.bs-docs-sidenav {
width: 220px;
width: 240px;
}
}
/* Large desktops and up */
@media screen and (min-width: 1200px) {
.bs-docs-sidenav {
width: 260px;
/* .bs-docs-sidenav {
width: 240px;
}
}
*/}
docs/assets/js/application.js
View file @ 081c0612
......@@ -14,14 +14,14 @@
})
// side bar
setTimeout(function () {
$('.bs-docs-sidenav').affix({
offset: {
top: function () { return $window.width() <= 980 ? 290 : 210 }
, bottom: 270
}
})
}, 100)
// setTimeout(function () {
// $('.bs-docs-sidenav').affix({
// offset: {
// top: function () { return $window.width() <= 980 ? 290 : 210 }
// , bottom: 270
// }
// })
// }, 100)
// make code pretty
window.prettyPrint && prettyPrint()
......
docs/components.html
View file @ 081c0612
......@@ -4,43 +4,30 @@ title: Components
---
<!-- Subhead
================================================== -->
<header class="bs-docs-jumbotron subhead">
<div class="container">
<h1>Components</h1>
<p class="lead">Dozens of reusable components built to provide navigation, alerts, popovers, and more.</p>
</div>
</header>
<div class="container bs-docs-container">
<div class="bs-docs-sidebar">
<h5 class="bs-docs-sidenav-heading">Components</h5>
<ul class="nav bs-docs-sidenav">
<li><a href="#dropdowns">Dropdowns</a></li>
<li><a href="#buttonGroups">Button groups</a></li>
<li><a href="#buttonDropdowns">Button dropdowns</a></li>
<li><a href="#navs">Navs</a></li>
<li><a href="#navbar">Navbar</a></li>
<li><a href="#breadcrumbs">Breadcrumbs</a></li>
<li><a href="#pagination">Pagination</a></li>
<li><a href="#labels">Labels</a></li>
<li><a href="#badges">Badges</a></li>
<li><a href="#typography">Typography</a></li>
<li><a href="#thumbnails">Thumbnails</a></li>
<li><a href="#alerts">Alerts</a></li>
<li><a href="#progress">Progress bars</a></li>
<li><a href="#media">Media object</a></li>
<li><a href="#misc">Misc</a></li>
</ul>
</div>
<!-- Docs nav
================================================== -->
<div class="row">
<div class="col-span-3 bs-docs-sidebar">
<ul class="nav nav-list bs-docs-sidenav">
<li><a href="#dropdowns"><i class="glyphicon glyphicon-chevron-right"></i> Dropdowns</a></li>
<li><a href="#buttonGroups"><i class="glyphicon glyphicon-chevron-right"></i> Button groups</a></li>
<li><a href="#buttonDropdowns"><i class="glyphicon glyphicon-chevron-right"></i> Button dropdowns</a></li>
<li><a href="#navs"><i class="glyphicon glyphicon-chevron-right"></i> Navs</a></li>
<li><a href="#navbar"><i class="glyphicon glyphicon-chevron-right"></i> Navbar</a></li>
<li><a href="#breadcrumbs"><i class="glyphicon glyphicon-chevron-right"></i> Breadcrumbs</a></li>
<li><a href="#pagination"><i class="glyphicon glyphicon-chevron-right"></i> Pagination</a></li>
<li><a href="#labels"><i class="glyphicon glyphicon-chevron-right"></i> Labels</a></li>
<li><a href="#badges"><i class="glyphicon glyphicon-chevron-right"></i> Badges</a></li>
<li><a href="#typography"><i class="glyphicon glyphicon-chevron-right"></i> Typography</a></li>
<li><a href="#thumbnails"><i class="glyphicon glyphicon-chevron-right"></i> Thumbnails</a></li>
<li><a href="#alerts"><i class="glyphicon glyphicon-chevron-right"></i> Alerts</a></li>
<li><a href="#progress"><i class="glyphicon glyphicon-chevron-right"></i> Progress bars</a></li>
<li><a href="#media"><i class="glyphicon glyphicon-chevron-right"></i> Media object</a></li>
<li><a href="#misc"><i class="glyphicon glyphicon-chevron-right"></i> Misc</a></li>
</ul>
</div>
<div class="col-span-9">
<div class="container bs-docs-container">
<!-- Dropdowns
================================================== -->
......@@ -1971,7 +1958,4 @@ title: Components
</div><!-- /span9 -->
</div><!-- row -->
</div><!-- /.container -->
docs/css.html
View file @ 081c0612
......@@ -3,39 +3,25 @@ layout: default
title: CSS
---
<!-- Subhead
================================================== -->
<header class="bs-docs-jumbotron subhead">
<div class="container">
<h1>CSS</h1>
<p class="lead">Fundamental HTML elements styled and enhanced with extensible classes.</p>
</div>
</header>
<div class="bs-docs-sidebar">
<h5 class="bs-docs-sidenav-heading">CSS</h5>
<ul class="nav bs-docs-sidenav">
<li><a href="#global">Global settings</a></li>
<li><a href="#grid">Grid system</a></li>
<li><a href="#typography">Typography</a></li>
<li><a href="#code">Code</a></li>
<li><a href="#tables">Tables</a></li>
<li><a href="#forms">Forms</a></li>
<li><a href="#buttons">Buttons</a></li>
<li><a href="#images">Images</a></li>
<li><a href="#icons">Glyphicons</a></li>
<li><a href="#responsive-utilities">Responsive utilities</a></li>
</ul>
</div>
<div class="container bs-docs-container">
<!-- Docs nav
================================================== -->
<div class="row">
<div class="col-span-3 bs-docs-sidebar">
<ul class="nav nav-list bs-docs-sidenav">
<li><a href="#global"><i class="glyphicon glyphicon-chevron-right"></i> Global settings</a></li>
<li><a href="#grid"><i class="glyphicon glyphicon-chevron-right"></i> Grid system</a></li>
<li><a href="#typography"><i class="glyphicon glyphicon-chevron-right"></i> Typography</a></li>
<li><a href="#code"><i class="glyphicon glyphicon-chevron-right"></i> Code</a></li>
<li><a href="#tables"><i class="glyphicon glyphicon-chevron-right"></i> Tables</a></li>
<li><a href="#forms"><i class="glyphicon glyphicon-chevron-right"></i> Forms</a></li>
<li><a href="#buttons"><i class="glyphicon glyphicon-chevron-right"></i> Buttons</a></li>
<li><a href="#images"><i class="glyphicon glyphicon-chevron-right"></i> Images</a></li>
<li><a href="#icons"><i class="glyphicon glyphicon-chevron-right"></i> Glyphicons</a></li>
<li><a href="#responsive-utilities"><i class="glyphicon glyphicon-chevron-right"></i> Responsive utilities</a></li>
</ul>
</div>
<div class="col-span-9">
<!-- Global Bootstrap settings
================================================== -->
<section id="global">
......@@ -2420,9 +2406,4 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</section>
</div><!-- /span9 -->
</div><!-- row -->
</div><!-- /.container -->
docs/customize.html
View file @ 081c0612
This diff is collapsed.
docs/getting-started.html
View file @ 081c0612
......@@ -4,35 +4,20 @@ title: Getting started
description: Overview of the project, its contents, and how to get started with a simple template.
---
<!-- Subhead
================================================== -->
<header class="bs-docs-jumbotron subhead">
<div class="container">
<h1>Getting started</h1>
<p class="lead">Overview of the project, its contents, and how to get started with a simple template.</p>
</div>
</header>
<div class="bs-docs-sidebar">
<h5 class="bs-docs-sidenav-heading">Getting started</h5>
<ul class="nav bs-docs-sidenav">
<li><a href="#download-bootstrap">Download</a></li>
<li><a href="#file-structure">File structure</a></li>
<li><a href="#contents">What's included</a></li>
<li><a href="#html-template">HTML template</a></li>
<li><a href="#examples">Examples</a></li>
<li><a href="#what-next">What next?</a></li>
</ul>
</div>
<div class="container bs-docs-container">
<!-- Docs nav
================================================== -->
<div class="row">
<div class="col-span-3 bs-docs-sidebar">
<ul class="nav nav-list bs-docs-sidenav">
<li><a href="#download-bootstrap"><i class="glyphicon glyphicon-chevron-right"></i> Download</a></li>
<li><a href="#file-structure"><i class="glyphicon glyphicon-chevron-right"></i> File structure</a></li>
<li><a href="#contents"><i class="glyphicon glyphicon-chevron-right"></i> What's included</a></li>
<li><a href="#html-template"><i class="glyphicon glyphicon-chevron-right"></i> HTML template</a></li>
<li><a href="#examples"><i class="glyphicon glyphicon-chevron-right"></i> Examples</a></li>
<li><a href="#what-next"><i class="glyphicon glyphicon-chevron-right"></i> What next?</a></li>
</ul>
</div>
<div class="col-span-9">
<!-- Download
================================================== -->
<section id="download-bootstrap">
......@@ -282,10 +267,4 @@ description: Overview of the project, its contents, and how to get started with
<a class="btn btn-large" href="./customize.html" style="margin-left: 5px;" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Next steps', 'Customize']);">Customize Bootstrap</a>
</section>
</div><!-- /span9 -->
</div><!-- row -->
</div><!-- /.container -->
docs/javascript.html
View file @ 081c0612
......@@ -3,41 +3,28 @@ layout: default
title: JavaScript plugins
---
<!-- Subhead
================================================== -->
<header class="bs-docs-jumbotron subhead">
<div class="container">
<h1>JavaScript</h1>
<p class="lead">Bring Bootstrap's components to life&mdash;now with 13 custom jQuery plugins.
</div>
</header>
<div class="bs-docs-sidebar">
<h5 class="bs-docs-sidenav-heading">JavaScript plugins</h5>
<ul class="nav bs-docs-sidenav">
<li><a href="#overview">Overview</a></li>
<li><a href="#transitions">Transitions</a></li>
<li><a href="#modals">Modal</a></li>
<li><a href="#dropdowns">Dropdown</a></li>
<li><a href="#scrollspy">Scrollspy</a></li>
<li><a href="#tabs">Tab</a></li>
<li><a href="#tooltips">Tooltip</a></li>
<li><a href="#popovers">Popover</a></li>
<li><a href="#alerts">Alert</a></li>
<li><a href="#buttons">Button</a></li>
<li><a href="#collapse">Collapse</a></li>
<li><a href="#carousel">Carousel</a></li>
<li><a href="#typeahead">Typeahead</a></li>
<li><a href="#affix">Affix</a></li>
</ul>
</div>
<div class="container bs-docs-container">
<!-- Docs nav
================================================== -->
<div class="row">
<div class="col-span-3 bs-docs-sidebar">
<ul class="nav nav-list bs-docs-sidenav">
<li><a href="#overview"><i class="glyphicon glyphicon-chevron-right"></i> Overview</a></li>
<li><a href="#transitions"><i class="glyphicon glyphicon-chevron-right"></i> Transitions</a></li>
<li><a href="#modals"><i class="glyphicon glyphicon-chevron-right"></i> Modal</a></li>
<li><a href="#dropdowns"><i class="glyphicon glyphicon-chevron-right"></i> Dropdown</a></li>
<li><a href="#scrollspy"><i class="glyphicon glyphicon-chevron-right"></i> Scrollspy</a></li>
<li><a href="#tabs"><i class="glyphicon glyphicon-chevron-right"></i> Tab</a></li>
<li><a href="#tooltips"><i class="glyphicon glyphicon-chevron-right"></i> Tooltip</a></li>
<li><a href="#popovers"><i class="glyphicon glyphicon-chevron-right"></i> Popover</a></li>
<li><a href="#alerts"><i class="glyphicon glyphicon-chevron-right"></i> Alert</a></li>
<li><a href="#buttons"><i class="glyphicon glyphicon-chevron-right"></i> Button</a></li>
<li><a href="#collapse"><i class="glyphicon glyphicon-chevron-right"></i> Collapse</a></li>
<li><a href="#carousel"><i class="glyphicon glyphicon-chevron-right"></i> Carousel</a></li>
<li><a href="#typeahead"><i class="glyphicon glyphicon-chevron-right"></i> Typeahead</a></li>
<li><a href="#affix"><i class="glyphicon glyphicon-chevron-right"></i> Affix</a></li>
</ul>
</div>
<div class="col-span-9">
<!-- Overview
================================================== -->
<section id="overview">
......@@ -1857,8 +1844,4 @@ $('[data-spy="affix"]').each(function () {
</section>
</div><!-- /span9 -->
</div><!-- row -->
</div><!-- /.container -->
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