From 081c061281c96818bf9a904a7e5e2a673aa7a54d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 28 Mar 2013 00:21:21 -0700
Subject: [PATCH] new subnav on all pages
---
docs/assets/css/docs.css | 89 ++++++++++-----
docs/assets/js/application.js | 16 +--
docs/components.html | 58 ++++------
docs/css.html | 49 +++------
docs/customize.html | 201 +++++++++++++++-------------------
docs/getting-started.html | 43 ++------
docs/javascript.html | 55 ++++------
7 files changed, 229 insertions(+), 282 deletions(-)
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 6b71176f89..926ae3913e 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -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;
}
-}
+*/}
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 18e9e84cd7..2a0d3a6c6e 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -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()
diff --git a/docs/components.html b/docs/components.html
index 06cbe37206..b42fad00bf 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -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 -->
diff --git a/docs/css.html b/docs/css.html
index f3ab7a00ae..1c317d2cd7 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -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><section></code> should be wrapped as inline.
</section>
-
-
- </div><!-- /span9 -->
- </div><!-- row -->
-
</div><!-- /.container -->
diff --git a/docs/customize.html b/docs/customize.html
index f4e01b3406..61a789b1a5 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -3,33 +3,18 @@ layout: default
title: Customize and download
---
-
-<!-- Masthead
-================================================== -->
-<header class="bs-docs-jumbotron subhead">
- <div class="container">
- <h1>Customize and download</h1>
- <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download Bootstrap</a> or customize variables, components, JavaScript plugins, and more.</p>
- </div>
-</header>
-
+<div class="bs-docs-sidebar">
+ <h5 class="bs-docs-sidenav-heading">Customize and download</h5>
+ <ul class="nav bs-docs-sidenav">
+ <li><a href="#components">1. Choose components</a></li>
+ <li><a href="#plugins">2. Select jQuery plugins</a></li>
+ <li><a href="#variables">3. Customize variables</a></li>
+ <li><a href="#download">4. Download</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="#components"><i class="glyphicon glyphicon-chevron-right"></i> 1. Choose components</a></li>
- <li><a href="#plugins"><i class="glyphicon glyphicon-chevron-right"></i> 2. Select jQuery plugins</a></li>
- <li><a href="#variables"><i class="glyphicon glyphicon-chevron-right"></i> 3. Customize variables</a></li>
- <li><a href="#download"><i class="glyphicon glyphicon-chevron-right"></i> 4. Download</a></li>
- </ul>
- </div>
- <div class="col-span-9">
-
-
<!-- Customize form
================================================== -->
<form>
@@ -41,7 +26,7 @@ title: Customize and download
</h1>
</div>
<div class="row download-builder">
- <div class="span3">
+ <div class="col-span-3">
<h3>Scaffolding</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="reset.less"> Normalize and reset</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="print.less"> Print</label>
@@ -57,7 +42,7 @@ title: Customize and download
<label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="sprites.less"> Icons</label>
</div><!-- /span -->
- <div class="span3">
+ <div class="col-span-3">
<h3>Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups and dropdowns</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> Navs, tabs, and pills</label>
@@ -78,7 +63,7 @@ title: Customize and download
<label class="checkbox"><input checked="checked" type="checkbox" value="accordion.less"> Collapse</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
</div><!-- /span -->
- <div class="span3">
+ <div class="col-span-3">
<h3>Miscellaneous</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label>
@@ -102,7 +87,7 @@ title: Customize and download
</h1>
</div>
<div class="row download-builder">
- <div class="span3">
+ <div class="col-span-3">
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-transition.js">
Transitions <small>(required for any animation)</small>
@@ -132,7 +117,7 @@ title: Customize and download
Popovers <small>(requires Tooltips)</small>
</label>
</div><!-- /span -->
- <div class="span3">
+ <div class="col-span-3">
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-affix.js">
Affix
@@ -158,7 +143,7 @@ title: Customize and download
Typeahead
</label>
</div><!-- /span -->
- <div class="span3">
+ <div class="col-span-3">
<h4 class="muted">Heads up!</h4>
<p class="muted">All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
</div><!-- /span -->
@@ -174,183 +159,183 @@ title: Customize and download
</h1>
</div>
<div class="row download-builder">
- <div class="span3">
+ <div class="col-span-3">
<h3>Scaffolding</h3>
<label>@body-background</label>
- <input type="text" class="span3" placeholder="#fff">
+ <input type="text" placeholder="#fff">
<label>@text-color</label>
- <input type="text" class="span3" placeholder="@grayDark">
+ <input type="text" placeholder="@grayDark">
<h3>Links</h3>
<label>@link-color</label>
- <input type="text" class="span3" placeholder="#08c">
+ <input type="text" placeholder="#08c">
<label>@link-color-hover</label>
- <input type="text" class="span3" placeholder="darken(@link-color, 15%)">
+ <input type="text" placeholder="darken(@link-color, 15%)">
<h3>Grid system</h3>
<label>@grid-columns</label>
- <input type="text" class="span3" placeholder="12">
+ <input type="text" placeholder="12">
<label>@grid-column-width</label>
- <input type="text" class="span3" placeholder="60px">
+ <input type="text" placeholder="60px">
<label>@grid-gutter-width</label>
- <input type="text" class="span3" placeholder="20px">
+ <input type="text" placeholder="20px">
<label>@grid-column-width-1200</label>
- <input type="text" class="span3" placeholder="70px">
+ <input type="text" placeholder="70px">
<label>@grid-gutter-width-1200</label>
- <input type="text" class="span3" placeholder="30px">
+ <input type="text" placeholder="30px">
<label>@grid-column-width-768</label>
- <input type="text" class="span3" placeholder="42px">
+ <input type="text" placeholder="42px">
<label>@grid-gutter-width-768</label>
- <input type="text" class="span3" placeholder="20px">
+ <input type="text" placeholder="20px">
</div><!-- /span -->
- <div class="span3">
+ <div class="col-span-3">
<h3>Typography</h3>
<label>@font-family-sans-serif</label>
- <input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
+ <input type="text" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@font-family-serif</label>
- <input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
+ <input type="text" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@font-family-monospace</label>
- <input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
+ <input type="text" placeholder="Menlo, Monaco, 'Courier New', monospace">
<label>@font-size-base</label>
- <input type="text" class="span3" placeholder="14px">
+ <input type="text" placeholder="14px">
<label>@font-family-base</label>
- <input type="text" class="span3" placeholder="@font-family-sans-serif">
+ <input type="text" placeholder="@font-family-sans-serif">
<label>@line-height-base</label>
- <input type="text" class="span3" placeholder="20px">
+ <input type="text" placeholder="20px">
<label>@headings-font-family</label>
- <input type="text" class="span3" placeholder="inherit">
+ <input type="text" placeholder="inherit">
<label>@headings-font-weight</label>
- <input type="text" class="span3" placeholder="bold">
+ <input type="text" placeholder="bold">
<label>@headingsColor</label>
- <input type="text" class="span3" placeholder="inherit">
+ <input type="text" placeholder="inherit">
<label>@font-size-large</label>
- <input type="text" class="span3" placeholder="@font-size-base * 1.25">
+ <input type="text" placeholder="@font-size-base * 1.25">
<label>@font-size-small</label>
- <input type="text" class="span3" placeholder="@font-size-base * 0.85">
+ <input type="text" placeholder="@font-size-base * 0.85">
<label>@font-size-mini</label>
- <input type="text" class="span3" placeholder="@font-size-base * 0.75">
+ <input type="text" placeholder="@font-size-base * 0.75">
<label>@padding-large</label>
- <input type="text" class="span3" placeholder="11px 19px">
+ <input type="text" placeholder="11px 19px">
<label>@padding-small</label>
- <input type="text" class="span3" placeholder="2px 10px">
+ <input type="text" placeholder="2px 10px">
<label>@padding-mini</label>
- <input type="text" class="span3" placeholder="1px 6px">
+ <input type="text" placeholder="1px 6px">
<label>@border-radius-base</label>
- <input type="text" class="span3" placeholder="4px">
+ <input type="text" placeholder="4px">
<label>@border-radius-large</label>
- <input type="text" class="span3" placeholder="6px">
+ <input type="text" placeholder="6px">
<label>@border-radius-small</label>
- <input type="text" class="span3" placeholder="3px">
+ <input type="text" placeholder="3px">
<label>@hero-background</label>
- <input type="text" class="span3" placeholder="@grayLighter">
+ <input type="text" placeholder="@grayLighter">
<label>@hero-heading-color</label>
- <input type="text" class="span3" placeholder="inherit">
+ <input type="text" placeholder="inherit">
<label>@hero-lead-color</label>
- <input type="text" class="span3" placeholder="inherit">
+ <input type="text" placeholder="inherit">
<h3>Tables</h3>
<label>@table-background</label>
- <input type="text" class="span3" placeholder="transparent">
+ <input type="text" placeholder="transparent">
<label>@table-background-accent</label>
- <input type="text" class="span3" placeholder="#f9f9f9">
+ <input type="text" placeholder="#f9f9f9">
<label>@table-background-hover</label>
- <input type="text" class="span3" placeholder="#f5f5f5">
+ <input type="text" placeholder="#f5f5f5">
<label>@table-border</label>
- <input type="text" class="span3" placeholder="#ddd">
+ <input type="text" placeholder="#ddd">
<h3>Forms</h3>
<label>@input-color-placeholder</label>
- <input type="text" class="span3" placeholder="@grayLight">
+ <input type="text" placeholder="@grayLight">
<label>@input-background</label>
- <input type="text" class="span3" placeholder="#fff">
+ <input type="text" placeholder="#fff">
<label>@input-border</label>
- <input type="text" class="span3" placeholder="#ccc">
+ <input type="text" placeholder="#ccc">
<label>@input-border-radius</label>
- <input type="text" class="span3" placeholder="3px">
+ <input type="text" placeholder="3px">
<label>@input-background-disabled</label>
- <input type="text" class="span3" placeholder="@grayLighter">
+ <input type="text" placeholder="@grayLighter">
<label>@form-actions-background</label>
- <input type="text" class="span3" placeholder="#f5f5f5">
+ <input type="text" placeholder="#f5f5f5">
<label>@btn-backround-primary</label>
- <input type="text" class="span3" placeholder="@link-color">
+ <input type="text" placeholder="@link-color">
<label>@btn-backround-primary-highlight</label>
- <input type="text" class="span3" placeholder="darken(#fff, 10%)">
+ <input type="text" placeholder="darken(#fff, 10%)">
</div><!-- /span -->
- <div class="span3">
+ <div class="col-span-3">
<h3>Form states & alerts</h3>
<label>@state-warning-text</label>
- <input type="text" class="span3" placeholder="#c09853">
+ <input type="text" placeholder="#c09853">
<label>@state-warning-background</label>
- <input type="text" class="span3" placeholder="#fcf8e3">
+ <input type="text" placeholder="#fcf8e3">
<label>@state-error-text</label>
- <input type="text" class="span3" placeholder="#b94a48">
+ <input type="text" placeholder="#b94a48">
<label>@state-error-background</label>
- <input type="text" class="span3" placeholder="#f2dede">
+ <input type="text" placeholder="#f2dede">
<label>@state-success-text</label>
- <input type="text" class="span3" placeholder="#468847">
+ <input type="text" placeholder="#468847">
<label>@state-success-background</label>
- <input type="text" class="span3" placeholder="#dff0d8">
+ <input type="text" placeholder="#dff0d8">
<label>@state-info-text</label>
- <input type="text" class="span3" placeholder="#3a87ad">
+ <input type="text" placeholder="#3a87ad">
<label>@state-info-background</label>
- <input type="text" class="span3" placeholder="#d9edf7">
+ <input type="text" placeholder="#d9edf7">
<h3>Navbar</h3>
<label>@navbar-height</label>
- <input type="text" class="span3" placeholder="40px">
+ <input type="text" placeholder="40px">
<label>@navbar-background</label>
- <input type="text" class="span3" placeholder="@grayDarker">
+ <input type="text" placeholder="@grayDarker">
<label>@navbar-background-highlight</label>
- <input type="text" class="span3" placeholder="@grayDark">
+ <input type="text" placeholder="@grayDark">
<label>@navbar-text</label>
- <input type="text" class="span3" placeholder="@grayLight">
+ <input type="text" placeholder="@grayLight">
<label>@navbar-brand-color</label>
- <input type="text" class="span3" placeholder="@navbar-link-color">
+ <input type="text" placeholder="@navbar-link-color">
<label>@navbar-link-color</label>
- <input type="text" class="span3" placeholder="@grayLight">
+ <input type="text" placeholder="@grayLight">
<label>@navbar-link-color-hover</label>
- <input type="text" class="span3" placeholder="#fff">
+ <input type="text" placeholder="#fff">
<label>@navbar-link-color-active</label>
- <input type="text" class="span3" placeholder="@navbar-link-color-hover">
+ <input type="text" placeholder="@navbar-link-color-hover">
<label>@navbar-link-background-hover</label>
- <input type="text" class="span3" placeholder="transparent">
+ <input type="text" placeholder="transparent">
<label>@navbar-link-background-active</label>
- <input type="text" class="span3" placeholder="@navbar-background">
+ <input type="text" placeholder="@navbar-background">
<label>@navbarSearchBackground</label>
- <input type="text" class="span3" placeholder="lighten(@navbar-background, 25%)">
+ <input type="text" placeholder="lighten(@navbar-background, 25%)">
<label>@navbarSearchBackgroundFocus</label>
- <input type="text" class="span3" placeholder="#fff">
+ <input type="text" placeholder="#fff">
<label>@navbarSearchBorder</label>
- <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
+ <input type="text" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label>
- <input type="text" class="span3" placeholder="#ccc">
+ <input type="text" placeholder="#ccc">
<label>@navbar-collapse-width</label>
- <input type="text" class="span3" placeholder="979px">
+ <input type="text" placeholder="979px">
<label>@navbar-collapse-width-desktop</label>
- <input type="text" class="span3" placeholder="@navbar-collapse-width + 1">
+ <input type="text" placeholder="@navbar-collapse-width + 1">
<h3>Dropdowns</h3>
<label>@dropdown-background</label>
- <input type="text" class="span3" placeholder="#fff">
+ <input type="text" placeholder="#fff">
<label>@dropdown-border</label>
- <input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
+ <input type="text" placeholder="rgba(0,0,0,.2)">
<label>@dropdown-link-color</label>
- <input type="text" class="span3" placeholder="@grayDark">
+ <input type="text" placeholder="@grayDark">
<label>@dropdown-link-color-hover</label>
- <input type="text" class="span3" placeholder="#fff">
+ <input type="text" placeholder="#fff">
<label>@dropdown-link-background-hover</label>
- <input type="text" class="span3" placeholder="@link-color">
+ <input type="text" placeholder="@link-color">
</div><!-- /span -->
</div><!-- /row -->
</section>
@@ -370,8 +355,4 @@ title: Customize and download
</form>
-
- </div><!-- /span9 -->
- </div><!-- row -->
-
</div><!-- /.container -->
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 5717bfbaa5..a2b3ba5144 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -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 -->
diff --git a/docs/javascript.html b/docs/javascript.html
index e64908672b..f5388461b0 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -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—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 -->
--
GitLab