Skip to content

B
bootstrap
Commit 3278c406 authored by Mark Otto's avatar Mark Otto
Browse files
Options

move nav into partial; rejigger content some more

parent df35e261
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 206 deletions
docs/_includes/docs-nav.html 0 → 100644
View file @ 3278c406
<div class="bs-docs-sidebar">
<ul class="nav bs-docs-sidenav">
<h3 class="bs-docs-sidenav-heading"><a href="/">Bootstrap</a></h3>
<li><a href="#welcome">Welcome!</a></li>
<li><a href="#getting-started">Getting started</a></li>
<li><a href="#whats-included">What's included</a></li>
<li><a href="#examples">Templates and examples</a></li>
<li><a class="nav-header" href="#css">CSS</a></li>
<li><a href="#css-overview">Overview</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 class="nav-header" href="#components">Components</a></li>
<li><a href="#icons">Glyphicons</a></li>
<li><a href="#responsive-utilities">Responsive utilities</a></li>
<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-components">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>
<li><a class="nav-header" href="#js">JavaScript</a></li>
<li><a href="#js-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>
docs/_layouts/default.html
View file @ 3278c406
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
</head> </head>
<body class="bs-docs-docs" data-spy="scroll" data-target=".bs-docs-sidebar"> <body class="bs-docs-docs" data-spy="scroll" data-target=".bs-docs-sidebar">
<!-- Docs nav -->
{% include docs-nav.html %}
<!-- Page content of course! --> <!-- Page content of course! -->
{{ content }} {{ content }}
......
docs/assets/css/docs.css
View file @ 3278c406
...@@ -34,7 +34,9 @@ body { ...@@ -34,7 +34,9 @@ body {
-------------------------------------------------- */ -------------------------------------------------- */
/* Padding for in-page bookmarks */ /* Padding for in-page bookmarks */
section { section,
.bs-docs-section {
padding-top: 30px;
} }
/* Few stylistic typography tweaks */ /* Few stylistic typography tweaks */
...@@ -52,10 +54,7 @@ section > ul li { ...@@ -52,10 +54,7 @@ section > ul li {
-------------------------------------------------- */ -------------------------------------------------- */
.bs-docs-section-header { .bs-docs-section-header {
margin: 60px 0; padding-top: 60px;
}
.bs-docs-section-header h1,
.bs-docs-section-header .lead {
color: #8a8a8a; color: #8a8a8a;
} }
.bs-docs-section-header h1 { .bs-docs-section-header h1 {
...@@ -205,11 +204,12 @@ section > ul li { ...@@ -205,11 +204,12 @@ section > ul li {
.bs-docs-sidenav > .active:focus > a { .bs-docs-sidenav > .active:focus > a {
font-weight: 500; font-weight: 500;
color: #428bca; color: #428bca;
background-color: transparent;
border-right: 1px solid #428bca; border-right: 1px solid #428bca;
} }
.bs-docs-sidenav-heading { .bs-docs-sidenav-heading {
margin: 0; margin: 0 0 25px;
} }
.bs-docs-sidenav-heading a { .bs-docs-sidenav-heading a {
display: block; display: block;
...@@ -223,17 +223,22 @@ section > ul li { ...@@ -223,17 +223,22 @@ section > ul li {
text-decoration: none; text-decoration: none;
} }
.bs-docs-sidenav .nav-header { /* Section headings for groups of links */
padding: 25px 20px 5px; .bs-docs-sidenav > li > .nav-header {
margin-top: 20px;
margin-bottom: 5px;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #333; color: #333;
} }
.bs-docs-sidenav > li + .nav-header { .bs-docs-sidenav > .active > .nav-header,
margin-top: 0; .bs-docs-sidenav > .active > .nav-header:hover {
color: #333;
border-color: #333;
} }
/* Bootstrap code examples /* Bootstrap code examples
-------------------------------------------------- */ -------------------------------------------------- */
...@@ -638,7 +643,6 @@ input.focused { ...@@ -638,7 +643,6 @@ input.focused {
/* Account for fixed navbar (which is static to start) */ /* Account for fixed navbar (which is static to start) */
.bs-docs-docs { .bs-docs-docs {
padding-left: 260px; padding-left: 260px;
padding-right: 20px;
} }
/* Undo custom padding */ /* Undo custom padding */
...@@ -677,6 +681,10 @@ input.focused { ...@@ -677,6 +681,10 @@ input.focused {
/* Tablets/desktops and up */ /* Tablets/desktops and up */
@media screen and (min-width: 992px) { @media screen and (min-width: 992px) {
.bs-docs-docs {
padding-left: 280px;
}
/* Icons */ /* Icons */
.the-icons li { .the-icons li {
width: 12.5%; width: 12.5%;
...@@ -686,5 +694,8 @@ input.focused { ...@@ -686,5 +694,8 @@ input.focused {
/* Large desktops and up */ /* Large desktops and up */
@media screen and (min-width: 1200px) { @media screen and (min-width: 1200px) {
.bs-docs-docs {
padding-left: 300px;
}
} }
docs/docs.html
View file @ 3278c406
This diff is collapsed.
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