Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip

This commit is contained in:
Marcus Schwab 2012-06-11 02:04:14 -07:00
commit 97cbefa72f
20 changed files with 4157 additions and 4040 deletions

View file

@ -3169,10 +3169,6 @@ input[type="submit"].btn.btn-mini {
border-radius: 4px; border-radius: 4px;
} }
.alert-heading {
color: inherit;
}
.alert .close { .alert .close {
position: relative; position: relative;
top: -2px; top: -2px;

View file

@ -12,18 +12,18 @@
body { body {
position: relative; position: relative;
padding-top: 40px; padding-top: 100px;
font-size: 14px; font-size: 14px;
background-color: #fff; background-color: #fff;
background-image: url(../img/grid-20px.png); background-image: url(../img/grid-20px.png);
background-repeat: repeat-x; background-repeat: repeat-x;
background-position: 0 0; background-position: 0 40px;
} }
/* Custom container for the narrow docs */ /* Custom container for the narrow docs */
.bs-docs-container { .bs-docs-container {
max-width: 780px; max-width: 780px;
margin: 0 0 0 240px; margin: 0 auto;
} }
/* Increase docs base type size and line-heights */ /* Increase docs base type size and line-heights */
@ -37,12 +37,44 @@ li {
line-height: 25px; line-height: 25px;
} }
/* Code in headings */
h3 code {
font-size: 14px;
font-weight: normal;
}
/* Tweak navbar brand link to be super sleek
-------------------------------------------------- */
.navbar,
.subnav {
font-size: 13px;
}
body > .navbar-fixed-top .brand {
padding-right: 0;
padding-left: 0;
margin-left: 20px;
float: right;
font-weight: bold;
color: #000;
text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125);
-webkit-transition: all .2s linear;
-moz-transition: all .2s linear;
transition: all .2s linear;
}
body > .navbar-fixed-top .brand:hover {
text-decoration: none;
}
/* Left nav /* Left nav
-------------------------------------------------- */ -------------------------------------------------- */
.bs-docs-nav { .bs-docs-nav {
display: none;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
@ -149,6 +181,7 @@ hr.soften {
------------------------- */ ------------------------- */
.jumbotron { .jumbotron {
position: relative; position: relative;
text-align: center;
} }
.jumbotron h1 { .jumbotron h1 {
margin-bottom: 10px; margin-bottom: 10px;
@ -177,7 +210,8 @@ hr.soften {
/* Masthead (docs home) /* Masthead (docs home)
------------------------- */ ------------------------- */
.masthead { .masthead {
margin-bottom: 60px; margin-top: 20px;
margin-bottom: 80px;
} }
.masthead h1, .masthead h1,
.masthead p { .masthead p {
@ -224,12 +258,16 @@ hr.soften {
------------------------- */ ------------------------- */
/* supporting docs pages */ /* supporting docs pages */
.subhead { .subhead {
text-align: left;
} }
.subhead h1 { .subhead h1 {
font-size: 60px; font-size: 60px;
} }
.subhead .lead { .subhead .lead {
margin-bottom: 30px;
line-height: 25px; line-height: 25px;
font-size: 30px;
line-height: 40px;
} }
/* Subnav */ /* Subnav */
@ -314,7 +352,7 @@ hr.soften {
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
} }
.subnav-fixed .nav { .subnav-fixed .nav {
width: 938px; max-width: 780px;
margin: 0 auto; margin: 0 auto;
padding: 0 1px; padding: 0 1px;
} }
@ -338,6 +376,7 @@ hr.soften {
margin: 36px 0 27px; margin: 36px 0 27px;
font-size: 40px; font-size: 40px;
font-weight: 300; font-weight: 300;
text-align: center;
} }
.marketing h2, .marketing h2,
.marketing h3 { .marketing h3 {
@ -364,6 +403,7 @@ hr.soften {
font-weight: 300; font-weight: 300;
line-height: 24px; line-height: 24px;
color: #999; color: #999;
text-align: center;
} }
@ -421,8 +461,12 @@ hr.soften {
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.075); -moz-box-shadow: 0 1px 2px rgba(0,0,0,.075);
box-shadow: 0 1px 2px rgba(0,0,0,.075); box-shadow: 0 1px 2px rgba(0,0,0,.075);
} }
.mini-layout,
.mini-layout .mini-layout-body,
.mini-layout.fluid .mini-layout-sidebar {
height: 300px;
}
.mini-layout { .mini-layout {
height: 240px;
margin-bottom: 20px; margin-bottom: 20px;
padding: 9px; padding: 9px;
} }
@ -435,7 +479,6 @@ hr.soften {
background-color: #dceaf4; background-color: #dceaf4;
margin: 0 auto; margin: 0 auto;
width: 70%; width: 70%;
height: 240px;
} }
.mini-layout.fluid .mini-layout-sidebar, .mini-layout.fluid .mini-layout-sidebar,
.mini-layout.fluid .mini-layout-header, .mini-layout.fluid .mini-layout-header,
@ -445,7 +488,6 @@ hr.soften {
.mini-layout.fluid .mini-layout-sidebar { .mini-layout.fluid .mini-layout-sidebar {
background-color: #bbd8e9; background-color: #bbd8e9;
width: 20%; width: 20%;
height: 240px;
} }
.mini-layout.fluid .mini-layout-body { .mini-layout.fluid .mini-layout-body {
width: 77.5%; width: 77.5%;
@ -598,6 +640,9 @@ h2 + .row {
} }
/* Example sites showcase */ /* Example sites showcase */
.example-sites {
margin-left: 20px;
}
.example-sites img { .example-sites img {
max-width: 100%; max-width: 100%;
margin: 0 auto; margin: 0 auto;
@ -694,9 +739,45 @@ form.well {
.bs-docs-example p:last-child { .bs-docs-example p:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.bs-docs-example .table { .bs-docs-example .table,
.bs-docs-example .progress,
.bs-docs-example .well,
.bs-docs-example .alert,
.bs-docs-example .hero-unit,
.bs-docs-example .pagination,
.bs-docs-example .navbar,
.bs-docs-example .nav {
margin-bottom: 5px; margin-bottom: 5px;
} }
.bs-docs-example .pagination {
margin-top: 0;
}
.bs-navbar-top-example,
.bs-navbar-bottom-example {
z-index: 1;
padding: 0;
height: 90px;
}
.bs-navbar-top-example {
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
}
.bs-navbar-top-example:after {
top: auto;
bottom: -1px;
-webkit-border-radius: 0 4px 0 4px;
-moz-border-radius: 0 4px 0 4px;
border-radius: 0 4px 0 4px;
}
.bs-navbar-bottom-example {
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
}
.bs-navbar-bottom-example .navbar {
margin-bottom: 0;
}
form.bs-docs-example { form.bs-docs-example {
padding-bottom: 19px; padding-bottom: 19px;
} }
@ -772,13 +853,6 @@ form.bs-docs-example {
border: 1px solid #d6e9c6; border: 1px solid #d6e9c6;
} }
/* Grid examples
------------------------- */
.bs-docs-grid {
width: 940px;
margin-left: -80px;
}
/* Responsive Docs /* Responsive Docs
@ -886,7 +960,7 @@ form.bs-docs-example {
/* Jumbotron buttons */ /* Jumbotron buttons */
.jumbotron .btn { .jumbotron .btn {
margin-bottom: 10px; margin-bottom: 10px;
} av }
/* Subnav */ /* Subnav */
.subnav { .subnav {
@ -988,14 +1062,13 @@ form.bs-docs-example {
/* LARGE DESKTOP SCREENS */ /* LARGE DESKTOP SCREENS */
@media (min-width: 1210px) { @media (min-width: 1210px) {
/* Update subnav container */ .bs-docs-container {
.subnav-fixed .nav { max-width: 970px;
width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */
} }
.bs-docs-grid { /* Update subnav container */
width: 1170px; .subnav-fixed .nav {
margin-left: -195px; max-width: 970px; /* 2px less to account for left/right borders being removed when in fixed mode */
} }
} }

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -27,84 +27,50 @@
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav"> <!-- Navbar
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> ================================================== -->
<ul class="bs-nav"> <div class="navbar navbar-fixed-top">
<li class=""> <div class="navbar-inner">
<a href="./scaffolding.html">Scaffolding</a> <div class="bs-docs-container">
<ul> <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<li><a href="./scaffolding.html#global">Global styles</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li> </button>
<li><a href="./scaffolding.html#layouts">Layouts</a></li> <a class="brand" href="./index.html">Bootstrap</a>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <div class="nav-collapse collapse">
</ul> <ul class="nav">
</li> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./base-css.html">Base CSS</a> </li>
<ul> <li class="">
<li><a href="./base-css.html#typography">Typography</a></li> <a href="./scaffolding.html">Scaffolding</a>
<li><a href="./base-css.html#code">Code</a></li> </li>
<li><a href="./base-css.html#tables">Tables</a></li> <li class="">
<li><a href="./base-css.html#forms">Forms</a></li> <a href="./base-css.html">Base CSS</a>
<li><a href="./base-css.html#buttons">Buttons</a></li> </li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li class="">
</ul> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./components.html">Components</a> <a href="./javascript.html">Javascript</a>
<ul> </li>
<li><a href="./components.html#buttonGroups">Button groups</a></li> <li class="">
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li> <a href="./less.html">LESS</a>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li> </li>
<li><a href="./components.html#navbar">Navbar</a></li> <li class="divider-vertical"></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li> <li class="active">
<li><a href="./components.html#pagination">Pagination</a></li> <a href="./download.html">Customize</a>
<li><a href="./components.html#labels">Labels</a></li> </li>
<li><a href="./components.html#badges">Badges</a></li> <li class="">
<li><a href="./components.html#typography">Typography</a></li> <a href="./examples.html">Examples</a>
<li><a href="./components.html#thumbnails">Thumbnails</a></li> </li>
<li><a href="./components.html#alerts">Alerts</a></li> </ul>
<li><a href="./components.html#progress">Progress bars</a></li> </div>
<li><a href="./components.html#misc">Miscellaneous</a></li> </div>
</ul> </div>
</li>
<li class="">
<a href="./javascript.html">Javascript</a>
<ul>
<li><a href="./javascript.html#javascript">All plugins</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</li>
<li class="">
<a href="./less.html">LESS</a>
<ul>
<li><a href="./less.html#builtWith">Built with Less</a></li>
<li><a href="./less.html#variables">Variables</a></li>
<li><a href="./less.html#mixins">Mixins</a></li>
<li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
</ul>
</li>
<li class="active">
<a href="./download.html">Customize</a>
</li>
<li class="">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div> </div>
<div class="bs-docs-container"> <div class="bs-docs-container">
@ -114,22 +80,18 @@
<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">
<ul class="nav nav-pills">
<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>
</header> </header>
<section id="contents">
<div class="bs-docs-contents">
<h3>Contents</h3>
<ol>
<li><a href="#components">Choose components</a></li>
<li><a href="#plugins">Select jQuery plugins</a></li>
<li><a href="#variables">Customize variables</a></li>
<li><a href="#download">Download</a></li>
</ol>
</div>
</section>
<form> <form>
<section class="download" id="components"> <section class="download" id="components">
<div class="page-header"> <div class="page-header">
@ -466,7 +428,7 @@
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer> </footer>
</div><!-- /container --> </div>

View file

@ -27,84 +27,50 @@
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav"> <!-- Navbar
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> ================================================== -->
<ul class="bs-nav"> <div class="navbar navbar-fixed-top">
<li class=""> <div class="navbar-inner">
<a href="./scaffolding.html">Scaffolding</a> <div class="bs-docs-container">
<ul> <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<li><a href="./scaffolding.html#global">Global styles</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li> </button>
<li><a href="./scaffolding.html#layouts">Layouts</a></li> <a class="brand" href="./index.html">Bootstrap</a>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <div class="nav-collapse collapse">
</ul> <ul class="nav">
</li> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./base-css.html">Base CSS</a> </li>
<ul> <li class="">
<li><a href="./base-css.html#typography">Typography</a></li> <a href="./scaffolding.html">Scaffolding</a>
<li><a href="./base-css.html#code">Code</a></li> </li>
<li><a href="./base-css.html#tables">Tables</a></li> <li class="">
<li><a href="./base-css.html#forms">Forms</a></li> <a href="./base-css.html">Base CSS</a>
<li><a href="./base-css.html#buttons">Buttons</a></li> </li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li class="">
</ul> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./components.html">Components</a> <a href="./javascript.html">Javascript</a>
<ul> </li>
<li><a href="./components.html#buttonGroups">Button groups</a></li> <li class="">
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li> <a href="./less.html">LESS</a>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li> </li>
<li><a href="./components.html#navbar">Navbar</a></li> <li class="divider-vertical"></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li> <li class="">
<li><a href="./components.html#pagination">Pagination</a></li> <a href="./download.html">Customize</a>
<li><a href="./components.html#labels">Labels</a></li> </li>
<li><a href="./components.html#badges">Badges</a></li> <li class="active">
<li><a href="./components.html#typography">Typography</a></li> <a href="./examples.html">Examples</a>
<li><a href="./components.html#thumbnails">Thumbnails</a></li> </li>
<li><a href="./components.html#alerts">Alerts</a></li> </ul>
<li><a href="./components.html#progress">Progress bars</a></li> </div>
<li><a href="./components.html#misc">Miscellaneous</a></li> </div>
</ul> </div>
</li>
<li class="">
<a href="./javascript.html">Javascript</a>
<ul>
<li><a href="./javascript.html#javascript">All plugins</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</li>
<li class="">
<a href="./less.html">LESS</a>
<ul>
<li><a href="./less.html#builtWith">Built with Less</a></li>
<li><a href="./less.html#variables">Variables</a></li>
<li><a href="./less.html#mixins">Mixins</a></li>
<li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
</ul>
</li>
<li class="">
<a href="./download.html">Customize</a>
</li>
<li class="active">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div> </div>
<div class="bs-docs-container"> <div class="bs-docs-container">
@ -151,7 +117,7 @@
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer> </footer>
</div><!-- /container --> </div>

View file

@ -27,84 +27,50 @@
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav"> <!-- Navbar
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> ================================================== -->
<ul class="bs-nav"> <div class="navbar navbar-fixed-top">
<li class=""> <div class="navbar-inner">
<a href="./scaffolding.html">Scaffolding</a> <div class="bs-docs-container">
<ul> <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<li><a href="./scaffolding.html#global">Global styles</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li> </button>
<li><a href="./scaffolding.html#layouts">Layouts</a></li> <a class="brand" href="./index.html">Bootstrap</a>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <div class="nav-collapse collapse">
</ul> <ul class="nav">
</li> <li class="active">
<li class=""> <a href="./index.html">Home</a>
<a href="./base-css.html">Base CSS</a> </li>
<ul> <li class="">
<li><a href="./base-css.html#typography">Typography</a></li> <a href="./scaffolding.html">Scaffolding</a>
<li><a href="./base-css.html#code">Code</a></li> </li>
<li><a href="./base-css.html#tables">Tables</a></li> <li class="">
<li><a href="./base-css.html#forms">Forms</a></li> <a href="./base-css.html">Base CSS</a>
<li><a href="./base-css.html#buttons">Buttons</a></li> </li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li class="">
</ul> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./components.html">Components</a> <a href="./javascript.html">Javascript</a>
<ul> </li>
<li><a href="./components.html#buttonGroups">Button groups</a></li> <li class="">
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li> <a href="./less.html">LESS</a>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li> </li>
<li><a href="./components.html#navbar">Navbar</a></li> <li class="divider-vertical"></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li> <li class="">
<li><a href="./components.html#pagination">Pagination</a></li> <a href="./download.html">Customize</a>
<li><a href="./components.html#labels">Labels</a></li> </li>
<li><a href="./components.html#badges">Badges</a></li> <li class="">
<li><a href="./components.html#typography">Typography</a></li> <a href="./examples.html">Examples</a>
<li><a href="./components.html#thumbnails">Thumbnails</a></li> </li>
<li><a href="./components.html#alerts">Alerts</a></li> </ul>
<li><a href="./components.html#progress">Progress bars</a></li> </div>
<li><a href="./components.html#misc">Miscellaneous</a></li> </div>
</ul> </div>
</li>
<li class="">
<a href="./javascript.html">Javascript</a>
<ul>
<li><a href="./javascript.html#javascript">All plugins</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</li>
<li class="">
<a href="./less.html">LESS</a>
<ul>
<li><a href="./less.html#builtWith">Built with Less</a></li>
<li><a href="./less.html#variables">Variables</a></li>
<li><a href="./less.html#mixins">Mixins</a></li>
<li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
</ul>
</li>
<li class="">
<a href="./download.html">Customize</a>
</li>
<li class="">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div> </div>
<div class="bs-docs-container"> <div class="bs-docs-container">
@ -152,7 +118,7 @@
<h1>Designed for everyone, everywhere.</h1> <h1>Designed for everyone, everywhere.</h1>
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p> <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
<div class="row"> <div class="row">
<div class="span4"> <div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png"> <img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
<h2>Built for and by nerds</h2> <h2>Built for and by nerds</h2>
<p>We love building awesome products on the web just like you, so we made Bootstrap. No matter your skill level, use it as a complete kit or use to start something more complex.</p> <p>We love building awesome products on the web just like you, so we made Bootstrap. No matter your skill level, use it as a complete kit or use to start something more complex.</p>
@ -169,7 +135,7 @@
<h2>Responsive design</h2> <h2>Responsive design</h2>
<p>As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.</p> <p>As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
</div> </div>
<div class="span4"> <div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png"> <img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
<h2>Styleguide docs</h2> <h2>Styleguide docs</h2>
<p>Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.</p> <p>Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.</p>
@ -193,27 +159,27 @@
<h1>Built with Bootstrap.</h1> <h1>Built with Bootstrap.</h1>
<p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p> <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p>
<ul class="thumbnails example-sites"> <ul class="thumbnails example-sites">
<li class="span2"> <li class="span3">
<a class="thumbnail" href="http://soundready.fm/" target="_blank"> <a class="thumbnail" href="http://soundready.fm/" target="_blank">
<img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm"> <img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
</a> </a>
</li> </li>
<li class="span2"> <li class="span3">
<a class="thumbnail" href="http://kippt.com/" target="_blank"> <a class="thumbnail" href="http://kippt.com/" target="_blank">
<img src="assets/img/example-sites/kippt.png" alt="Kippt"> <img src="assets/img/example-sites/kippt.png" alt="Kippt">
</a> </a>
</li> </li>
<li class="span2"> <li class="span3">
<a class="thumbnail" href="http://www.fleetio.com/" target="_blank"> <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
<img src="assets/img/example-sites/fleetio.png" alt="Fleetio"> <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
</a> </a>
</li> </li>
<li class="span2"> <!-- <li class="span2">
<a class="thumbnail" href="http://www.jshint.com/" target="_blank"> <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
<img src="assets/img/example-sites/jshint.png" alt="JS Hint"> <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
</a> </a>
</li> </li>
</ul> --> </ul>
</div><!-- /.marketing --> </div><!-- /.marketing -->
@ -227,7 +193,7 @@
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer> </footer>
</div><!-- /container --> </div>

View file

@ -27,84 +27,50 @@
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav"> <!-- Navbar
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> ================================================== -->
<ul class="bs-nav"> <div class="navbar navbar-fixed-top">
<li class=""> <div class="navbar-inner">
<a href="./scaffolding.html">Scaffolding</a> <div class="bs-docs-container">
<ul> <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<li><a href="./scaffolding.html#global">Global styles</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li> </button>
<li><a href="./scaffolding.html#layouts">Layouts</a></li> <a class="brand" href="./index.html">Bootstrap</a>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <div class="nav-collapse collapse">
</ul> <ul class="nav">
</li> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./base-css.html">Base CSS</a> </li>
<ul> <li class="">
<li><a href="./base-css.html#typography">Typography</a></li> <a href="./scaffolding.html">Scaffolding</a>
<li><a href="./base-css.html#code">Code</a></li> </li>
<li><a href="./base-css.html#tables">Tables</a></li> <li class="">
<li><a href="./base-css.html#forms">Forms</a></li> <a href="./base-css.html">Base CSS</a>
<li><a href="./base-css.html#buttons">Buttons</a></li> </li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li class="">
</ul> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="active">
<a href="./components.html">Components</a> <a href="./javascript.html">Javascript</a>
<ul> </li>
<li><a href="./components.html#buttonGroups">Button groups</a></li> <li class="">
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li> <a href="./less.html">LESS</a>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li> </li>
<li><a href="./components.html#navbar">Navbar</a></li> <li class="divider-vertical"></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li> <li class="">
<li><a href="./components.html#pagination">Pagination</a></li> <a href="./download.html">Customize</a>
<li><a href="./components.html#labels">Labels</a></li> </li>
<li><a href="./components.html#badges">Badges</a></li> <li class="">
<li><a href="./components.html#typography">Typography</a></li> <a href="./examples.html">Examples</a>
<li><a href="./components.html#thumbnails">Thumbnails</a></li> </li>
<li><a href="./components.html#alerts">Alerts</a></li> </ul>
<li><a href="./components.html#progress">Progress bars</a></li> </div>
<li><a href="./components.html#misc">Miscellaneous</a></li> </div>
</ul> </div>
</li>
<li class="active">
<a href="./javascript.html">Javascript</a>
<ul>
<li><a href="./javascript.html#javascript">All plugins</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</li>
<li class="">
<a href="./less.html">LESS</a>
<ul>
<li><a href="./less.html#builtWith">Built with Less</a></li>
<li><a href="./less.html#variables">Variables</a></li>
<li><a href="./less.html#mixins">Mixins</a></li>
<li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
</ul>
</li>
<li class="">
<a href="./download.html">Customize</a>
</li>
<li class="">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div> </div>
<div class="bs-docs-container"> <div class="bs-docs-container">
@ -114,73 +80,54 @@
<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">
<ul class="nav nav-pills">
<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>
</ul>
</div>
</header> </header>
<!-- Using Javascript w/ Bootstrap
================================================== --> <!-- Overview
<section id="javascript"> ================================================== -->
<div class="page-header"> <section id="overview">
<h1>jQuery plugins <small>A dozen Bootstrap plugins to get you started</small></h1> <div class="page-header">
</div> <h1>Javascript in Bootstrap</h1>
<div class="row"> </div>
<div class="span4"> <h3>Individual or compiled</h3>
<h3><a href="./javascript.html#modals">Modals</a></h3> <p>If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.</p>
<p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p> <h3>Data attributea</h3>
</div> <p>...</p>
<div class="span4"> <h3>Programmatic API</h3>
<h3><a href="./javascript.html#dropdowns">Dropdowns</a></h3> <p>...</p>
<p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#scrollspy">Scrollspy</a></h3> </section>
<p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#tabs">Togglable tabs</a></h3> <!-- Transitions
<p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p> ================================================== -->
</div> <section id="modals">
</div> <!-- /row --> <div class="page-header">
<div class="row"> <h1>Transitions <small>bootstrap-transition.js</small></h1>
<div class="span4"> </div>
<h3><a href="./javascript.html#tooltips">Tooltips</a></h3> <h3>About transitions</h3>
<p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images&mdash;they use CSS3 for animations and data-attributes for local title storage.</p> <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
</div> <p class="muted"><strong>*</strong> Required for animation in plugins</p>
<div class="span4">
<h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small></h3>
<p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
<p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltips</a> to be included</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#alerts">Alert messages</a></h3>
<p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#buttons">Buttons</a></h3>
<p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
</div>
</div> <!-- /row -->
<div class="row" style="margin-bottom: 9px;">
<div class="span4">
<h3><a href="./javascript.html#collapse">Collapse</a></h3>
<p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#carousel">Carousel</a></h3>
<p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
<p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
</div>
<div class="span4">
<h3>Transitions <small class="muted">*</small></h3>
<p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
<p class="muted"><strong>*</strong> Required for animation in plugins</p>
</div>
</div> <!-- /row -->
<div class="alert alert-info"><strong>Heads up!</strong> If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.</div>
</section> </section>
@ -194,7 +141,6 @@
<h3>About modals</h3> <h3>About modals</h3>
<p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p> <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
<a href="assets/js/bootstrap-modal.js" target="_blank" class="btn">Download file</a>
<h2>Static example</h2> <h2>Static example</h2>
<p>Below is a statically rendered modal.</p> <p>Below is a statically rendered modal.</p>
@ -384,7 +330,6 @@ $('#myModal').on('hidden', function () {
<h3>About dropdowns</h3> <h3>About dropdowns</h3>
<p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p> <p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
<a href="assets/js/bootstrap-dropdown.js" target="_blank" class="btn">Download file</a>
<h2>Examples</h2> <h2>Examples</h2>
<p>Click on the dropdown nav links in the navbar and pills below to test dropdowns.</p> <p>Click on the dropdown nav links in the navbar and pills below to test dropdowns.</p>
@ -527,7 +472,6 @@ $('#myModal').on('hidden', function () {
</div> </div>
<p>The ScrollSpy plugin is for automatically updating nav targets based on scroll position.</p> <p>The ScrollSpy plugin is for automatically updating nav targets based on scroll position.</p>
<a href="assets/js/bootstrap-scrollspy.js" target="_blank" class="btn">Download file</a>
<h2>Example navbar with scrollspy</h2> <h2>Example navbar with scrollspy</h2>
<p>Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!</p> <p>Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!</p>
@ -643,7 +587,6 @@ $('[data-spy="scroll"]').each(function () {
</div> </div>
<p>This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.</p> <p>This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.</p>
<a href="assets/js/bootstrap-tab.js" target="_blank" class="btn">Download file</a>
<h2>Example tabs</h2> <h2>Example tabs</h2>
<p>Click the tabs below to toggle between hidden panes, even via dropdown menus.</p> <p>Click the tabs below to toggle between hidden panes, even via dropdown menus.</p>
@ -759,7 +702,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h3>About Tooltips</h3> <h3>About Tooltips</h3>
<p>Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.</p> <p>Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.</p>
<a href="assets/js/bootstrap-tooltip.js" target="_blank" class="btn">Download file</a>
<h2>Example use of Tooltips</h2> <h2>Example use of Tooltips</h2>
<p>Hover over the links below to see tooltips:</p> <p>Hover over the links below to see tooltips:</p>
@ -866,7 +808,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h3>About popovers</h3> <h3>About popovers</h3>
<p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p> <p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
<p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltip</a> to be included</p> <p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltip</a> to be included</p>
<a href="assets/js/bootstrap-popover.js" target="_blank" class="btn">Download file</a>
<h2>Example hover popover</h2> <h2>Example hover popover</h2>
<p>Hover over the button to trigger the popover.</p> <p>Hover over the button to trigger the popover.</p>
@ -975,7 +916,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h3>About alerts</h3> <h3>About alerts</h3>
<p>The alert plugin is a tiny class for adding close functionality to alerts.</p> <p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
<a href="assets/js/bootstrap-alert.js" target="_blank" class="btn">Download</a>
<h2>Example alerts</h2> <h2>Example alerts</h2>
<p>The alerts plugin works on regular alert messages, and block messages.</p> <p>The alerts plugin works on regular alert messages, and block messages.</p>
@ -1046,7 +986,6 @@ $('#my-alert').bind('closed', function () {
<h3>About</h3> <h3>About</h3>
<p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p> <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
<a href="assets/js/bootstrap-button.js" target="_blank" class="btn">Download file</a>
<h2>Example uses</h2> <h2>Example uses</h2>
<p>Use the buttons plugin for states and toggles.</p> <p>Use the buttons plugin for states and toggles.</p>
@ -1141,7 +1080,6 @@ $('#my-alert').bind('closed', function () {
<h3>About</h3> <h3>About</h3>
<p>Get base styles and flexible support for collapsible components like accordions and navigation.</p> <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
<a href="assets/js/bootstrap-collapse.js" target="_blank" class="btn">Download file</a>
<p class="muted"><strong>*</strong> Requires the Transitions plugin to be included.</p> <p class="muted"><strong>*</strong> Requires the Transitions plugin to be included.</p>
<h2>Example accordion</h2> <h2>Example accordion</h2>
@ -1290,7 +1228,6 @@ $('#myCollapsible').on('hidden', function () {
<h3>About</h3> <h3>About</h3>
<p>A generic plugin for cycling through elements. A merry-go-round.</p> <p>A generic plugin for cycling through elements. A merry-go-round.</p>
<a href="assets/js/bootstrap-carousel.js" target="_blank" class="btn">Download file</a>
<h2>Example carousel</h2> <h2>Example carousel</h2>
<p>Watch the slideshow below.</p> <p>Watch the slideshow below.</p>
@ -1424,7 +1361,6 @@ $('.carousel').carousel({
<h3>About</h3> <h3>About</h3>
<p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p> <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
<a href="assets/js/bootstrap-typeahead.js" target="_blank" class="btn">Download file</a>
<h2>Example</h2> <h2>Example</h2>
<p>Start typing in the field below to show the typeahead results.</p> <p>Start typing in the field below to show the typeahead results.</p>
@ -1499,7 +1435,7 @@ $('.carousel').carousel({
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer> </footer>
</div><!-- /container --> </div>

View file

@ -27,84 +27,50 @@
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav"> <!-- Navbar
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> ================================================== -->
<ul class="bs-nav"> <div class="navbar navbar-fixed-top">
<li class=""> <div class="navbar-inner">
<a href="./scaffolding.html">Scaffolding</a> <div class="bs-docs-container">
<ul> <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<li><a href="./scaffolding.html#global">Global styles</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li> </button>
<li><a href="./scaffolding.html#layouts">Layouts</a></li> <a class="brand" href="./index.html">Bootstrap</a>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <div class="nav-collapse collapse">
</ul> <ul class="nav">
</li> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./base-css.html">Base CSS</a> </li>
<ul> <li class="">
<li><a href="./base-css.html#typography">Typography</a></li> <a href="./scaffolding.html">Scaffolding</a>
<li><a href="./base-css.html#code">Code</a></li> </li>
<li><a href="./base-css.html#tables">Tables</a></li> <li class="">
<li><a href="./base-css.html#forms">Forms</a></li> <a href="./base-css.html">Base CSS</a>
<li><a href="./base-css.html#buttons">Buttons</a></li> </li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li class="">
</ul> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./components.html">Components</a> <a href="./javascript.html">Javascript</a>
<ul> </li>
<li><a href="./components.html#buttonGroups">Button groups</a></li> <li class="active">
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li> <a href="./less.html">LESS</a>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li> </li>
<li><a href="./components.html#navbar">Navbar</a></li> <li class="divider-vertical"></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li> <li class="">
<li><a href="./components.html#pagination">Pagination</a></li> <a href="./download.html">Customize</a>
<li><a href="./components.html#labels">Labels</a></li> </li>
<li><a href="./components.html#badges">Badges</a></li> <li class="">
<li><a href="./components.html#typography">Typography</a></li> <a href="./examples.html">Examples</a>
<li><a href="./components.html#thumbnails">Thumbnails</a></li> </li>
<li><a href="./components.html#alerts">Alerts</a></li> </ul>
<li><a href="./components.html#progress">Progress bars</a></li> </div>
<li><a href="./components.html#misc">Miscellaneous</a></li> </div>
</ul> </div>
</li>
<li class="">
<a href="./javascript.html">Javascript</a>
<ul>
<li><a href="./javascript.html#javascript">All plugins</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</li>
<li class="active">
<a href="./less.html">LESS</a>
<ul>
<li><a href="./less.html#builtWith">Built with Less</a></li>
<li><a href="./less.html#variables">Variables</a></li>
<li><a href="./less.html#mixins">Mixins</a></li>
<li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
</ul>
</li>
<li class="">
<a href="./download.html">Customize</a>
</li>
<li class="">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div> </div>
<div class="bs-docs-container"> <div class="bs-docs-container">
@ -114,21 +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>
</header> <div class="subnav">
<ul class="nav nav-pills">
<section id="contents">
<div class="bs-docs-contents">
<h3>Contents</h3>
<ol>
<li><a href="#builtWith">Built with Less</a></li> <li><a href="#builtWith">Built with Less</a></li>
<li><a href="#variables">Variables</a></li> <li><a href="#variables">Variables</a></li>
<li><a href="#mixins">Mixins</a></li> <li><a href="#mixins">Mixins</a></li>
<li><a href="#compiling">Compiling Bootstrap</a></li> <li><a href="#compiling">Compiling Bootstrap</a></li>
</ol> </ul>
</div> </div>
</section> </header>
@ -1053,7 +1013,7 @@
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer> </footer>
</div><!-- /container --> </div>

View file

@ -27,84 +27,50 @@
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav"> <!-- Navbar
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> ================================================== -->
<ul class="bs-nav"> <div class="navbar navbar-fixed-top">
<li class="active"> <div class="navbar-inner">
<a href="./scaffolding.html">Scaffolding</a> <div class="bs-docs-container">
<ul> <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<li><a href="./scaffolding.html#global">Global styles</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li> </button>
<li><a href="./scaffolding.html#layouts">Layouts</a></li> <a class="brand" href="./index.html">Bootstrap</a>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <div class="nav-collapse collapse">
</ul> <ul class="nav">
</li> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./base-css.html">Base CSS</a> </li>
<ul> <li class="active">
<li><a href="./base-css.html#typography">Typography</a></li> <a href="./scaffolding.html">Scaffolding</a>
<li><a href="./base-css.html#code">Code</a></li> </li>
<li><a href="./base-css.html#tables">Tables</a></li> <li class="">
<li><a href="./base-css.html#forms">Forms</a></li> <a href="./base-css.html">Base CSS</a>
<li><a href="./base-css.html#buttons">Buttons</a></li> </li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li class="">
</ul> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./components.html">Components</a> <a href="./javascript.html">Javascript</a>
<ul> </li>
<li><a href="./components.html#buttonGroups">Button groups</a></li> <li class="">
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li> <a href="./less.html">LESS</a>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li> </li>
<li><a href="./components.html#navbar">Navbar</a></li> <li class="divider-vertical"></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li> <li class="">
<li><a href="./components.html#pagination">Pagination</a></li> <a href="./download.html">Customize</a>
<li><a href="./components.html#labels">Labels</a></li> </li>
<li><a href="./components.html#badges">Badges</a></li> <li class="">
<li><a href="./components.html#typography">Typography</a></li> <a href="./examples.html">Examples</a>
<li><a href="./components.html#thumbnails">Thumbnails</a></li> </li>
<li><a href="./components.html#alerts">Alerts</a></li> </ul>
<li><a href="./components.html#progress">Progress bars</a></li> </div>
<li><a href="./components.html#misc">Miscellaneous</a></li> </div>
</ul> </div>
</li>
<li class="">
<a href="./javascript.html">Javascript</a>
<ul>
<li><a href="./javascript.html#javascript">All plugins</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</li>
<li class="">
<a href="./less.html">LESS</a>
<ul>
<li><a href="./less.html#builtWith">Built with Less</a></li>
<li><a href="./less.html#variables">Variables</a></li>
<li><a href="./less.html#mixins">Mixins</a></li>
<li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
</ul>
</li>
<li class="">
<a href="./download.html">Customize</a>
</li>
<li class="">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div> </div>
<div class="bs-docs-container"> <div class="bs-docs-container">
@ -114,6 +80,16 @@
<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">
<ul class="nav nav-pills">
<li><a href="#global">Global styles</a></li>
<li><a href="#gridSystem">Grid system</a></li>
<li><a href="#fluidGridSystem">Fluid grid system</a></li>
<li><a href="#gridCustomization">Customizing</a></li>
<li><a href="#layouts">Layouts</a></li>
<li><a href="#responsive">Responsive design</a></li>
</ul>
</div>
</header> </header>
@ -173,24 +149,22 @@
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div>
<div class="span1">1</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span2">2</div>
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4">4</div> <div class="span4">4</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span8">8</div>
</div>
<div class="row show-grid">
<div class="span6">6</div>
<div class="span6">6</div> <div class="span6">6</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span12">12</div> <div class="span5">5</div>
<div class="span5">5</div>
</div>
<div class="row show-grid">
<div class="span10">10</div>
</div> </div>
</div> </div>
@ -209,14 +183,14 @@
<div class="bs-docs-grid"> <div class="bs-docs-grid">
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4 offset4">4 offset 4</div> <div class="span4 offset2">4 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span3 offset3">3 offset 3</div> <div class="span3 offset2">3 offset 2</div>
<div class="span3 offset3">3 offset 3</div> <div class="span3 offset2">3 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span8 offset4">8 offset 4</div> <div class="span6 offset4">6 offset 4</div>
</div><!-- /row --> </div><!-- /row -->
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -231,13 +205,13 @@
<h3>Example</h3> <h3>Example</h3>
<p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p> <p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p>
<div class="row show-grid"> <div class="row show-grid">
<div class="span8"> <div class="span10">
Level 1 of column Level 1 of column
<div class="row show-grid"> <div class="row show-grid">
<div class="span4"> <div class="span5">
Level 2 Level 2
</div> </div>
<div class="span4"> <div class="span5">
Level 2 Level 2
</div> </div>
</div> </div>
@ -245,11 +219,11 @@
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span8"&gt; &lt;div class="span10"&gt;
Level 1 column Level 1 column
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span4"&gt;Level 2&lt;/div&gt; &lt;div class="span5"&gt;Level 2&lt;/div&gt;
&lt;div class="span4"&gt;Level 2&lt;/div&gt; &lt;div class="span5"&gt;Level 2&lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
@ -604,7 +578,7 @@
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer> </footer>
</div><!-- /container --> </div>

View file

@ -39,84 +39,50 @@
{{/production}} {{/production}}
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav"> <!-- Navbar
<h3 class="bs-docs-logo"><a href="./index.html">{{_i}}Bootstrap{{/i}}</a></h3> ================================================== -->
<ul class="bs-nav"> <div class="navbar navbar-fixed-top">
<li class="{{scaffolding}}"> <div class="navbar-inner">
<a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a> <div class="bs-docs-container">
<ul> <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<li><a href="./scaffolding.html#global">{{_i}}Global styles{{/i}}</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridSystem">{{_i}}Grid system{{/i}}</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridCustomization">{{_i}}Customizing{{/i}}</a></li> </button>
<li><a href="./scaffolding.html#layouts">{{_i}}Layouts{{/i}}</a></li> <a class="brand" href="./index.html">Bootstrap</a>
<li><a href="./scaffolding.html#responsive">{{_i}}Responsive design{{/i}}</a></li> <div class="nav-collapse collapse">
</ul> <ul class="nav">
</li> <li class="{{index}}">
<li class="{{base-css}}"> <a href="./index.html">{{_i}}Home{{/i}}</a>
<a href="./base-css.html">{{_i}}Base CSS{{/i}}</a> </li>
<ul> <li class="{{scaffolding}}">
<li><a href="./base-css.html#typography">{{_i}}Typography{{/i}}</a></li> <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
<li><a href="./base-css.html#code">{{_i}}Code{{/i}}</a></li> </li>
<li><a href="./base-css.html#tables">{{_i}}Tables{{/i}}</a></li> <li class="{{base-css}}">
<li><a href="./base-css.html#forms">{{_i}}Forms{{/i}}</a></li> <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
<li><a href="./base-css.html#buttons">{{_i}}Buttons{{/i}}</a></li> </li>
<li><a href="./base-css.html#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li> <li class="{{components}}">
</ul> <a href="./components.html">{{_i}}Components{{/i}}</a>
</li> </li>
<li class="{{components}}"> <li class="{{javascript}}">
<a href="./components.html">{{_i}}Components{{/i}}</a> <a href="./javascript.html">{{_i}}Javascript{{/i}}</a>
<ul> </li>
<li><a href="./components.html#buttonGroups">{{_i}}Button groups{{/i}}</a></li> <li class="{{less}}">
<li><a href="./components.html#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li> <a href="./less.html">{{_i}}LESS{{/i}}</a>
<li><a href="./components.html#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li> </li>
<li><a href="./components.html#navbar">{{_i}}Navbar{{/i}}</a></li> <li class="divider-vertical"></li>
<li><a href="./components.html#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li> <li class="{{download}}">
<li><a href="./components.html#pagination">{{_i}}Pagination{{/i}}</a></li> <a href="./download.html">{{_i}}Customize{{/i}}</a>
<li><a href="./components.html#labels">{{_i}}Labels{{/i}}</a></li> </li>
<li><a href="./components.html#badges">{{_i}}Badges{{/i}}</a></li> <li class="{{examples}}">
<li><a href="./components.html#typography">{{_i}}Typography{{/i}}</a></li> <a href="./examples.html">{{_i}}Examples{{/i}}</a>
<li><a href="./components.html#thumbnails">{{_i}}Thumbnails{{/i}}</a></li> </li>
<li><a href="./components.html#alerts">{{_i}}Alerts{{/i}}</a></li> </ul>
<li><a href="./components.html#progress">{{_i}}Progress bars{{/i}}</a></li> </div>
<li><a href="./components.html#misc">{{_i}}Miscellaneous{{/i}}</a></li> </div>
</ul> </div>
</li>
<li class="{{javascript}}">
<a href="./javascript.html">{{_i}}Javascript{{/i}}</a>
<ul>
<li><a href="./javascript.html#javascript">{{_i}}All plugins{{/i}}</a></li>
<li><a href="./javascript.html#modals">{{_i}}Modal{{/i}}</a></li>
<li><a href="./javascript.html#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
<li><a href="./javascript.html#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
<li><a href="./javascript.html#tabs">{{_i}}Tab{{/i}}</a></li>
<li><a href="./javascript.html#tooltips">{{_i}}Tooltip{{/i}}</a></li>
<li><a href="./javascript.html#popovers">{{_i}}Popover{{/i}}</a></li>
<li><a href="./javascript.html#alerts">{{_i}}Alert{{/i}}</a></li>
<li><a href="./javascript.html#buttons">{{_i}}Button{{/i}}</a></li>
<li><a href="./javascript.html#collapse">{{_i}}Collapse{{/i}}</a></li>
<li><a href="./javascript.html#carousel">{{_i}}Carousel{{/i}}</a></li>
<li><a href="./javascript.html#typeahead">{{_i}}Typeahead{{/i}}</a></li>
</ul>
</li>
<li class="{{less}}">
<a href="./less.html">{{_i}}LESS{{/i}}</a>
<ul>
<li><a href="./less.html#builtWith">{{_i}}Built with Less{{/i}}</a></li>
<li><a href="./less.html#variables">{{_i}}Variables{{/i}}</a></li>
<li><a href="./less.html#mixins">{{_i}}Mixins{{/i}}</a></li>
<li><a href="./less.html#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
</ul>
</li>
<li class="{{download}}">
<a href="./download.html">{{_i}}Customize{{/i}}</a>
</li>
<li class="{{examples}}">
<a href="./examples.html">{{_i}}Examples{{/i}}</a>
</li>
</ul>
</div> </div>
<div class="bs-docs-container"> <div class="bs-docs-container">
@ -133,7 +99,7 @@
<p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p> <p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
</footer> </footer>
</div><!-- /container --> </div>{{! /container }}

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -3,22 +3,18 @@
<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">
<ul class="nav nav-pills">
<li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
<li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
<li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
<li><a href="#download">{{_i}}4. Download{{/i}}</a></li>
</ul>
</div>
</header> </header>
<section id="contents">
<div class="bs-docs-contents">
<h3>{{_i}}Contents{{/i}}</h3>
<ol>
<li><a href="#components">{{_i}}Choose components{{/i}}</a></li>
<li><a href="#plugins">{{_i}}Select jQuery plugins{{/i}}</a></li>
<li><a href="#variables">{{_i}}Customize variables{{/i}}</a></li>
<li><a href="#download">{{_i}}Download{{/i}}</a></li>
</ol>
</div>
</section>
<form> <form>
<section class="download" id="components"> <section class="download" id="components">
<div class="page-header"> <div class="page-header">

View file

@ -41,7 +41,7 @@
<h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1> <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
<p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p> <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
<div class="row"> <div class="row">
<div class="span4"> <div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png"> <img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
<h2>{{_i}}Built for and by nerds{{/i}}</h2> <h2>{{_i}}Built for and by nerds{{/i}}</h2>
<p>{{_i}}We love building awesome products on the web just like you, so we made Bootstrap. No matter your skill level, use it as a complete kit or use to start something more complex.{{/i}}</p> <p>{{_i}}We love building awesome products on the web just like you, so we made Bootstrap. No matter your skill level, use it as a complete kit or use to start something more complex.{{/i}}</p>
@ -58,7 +58,7 @@
<h2>{{_i}}Responsive design{{/i}}</h2> <h2>{{_i}}Responsive design{{/i}}</h2>
<p>{{_i}}As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}</p> <p>{{_i}}As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}</p>
</div> </div>
<div class="span4"> <div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png"> <img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
<h2>{{_i}}Styleguide docs{{/i}}</h2> <h2>{{_i}}Styleguide docs{{/i}}</h2>
<p>{{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}</p> <p>{{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}</p>
@ -82,26 +82,26 @@
<h1>{{_i}}Built with Bootstrap.{{/i}}</h1> <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
<p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p> <p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>
<ul class="thumbnails example-sites"> <ul class="thumbnails example-sites">
<li class="span2"> <li class="span3">
<a class="thumbnail" href="http://soundready.fm/" target="_blank"> <a class="thumbnail" href="http://soundready.fm/" target="_blank">
<img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm"> <img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
</a> </a>
</li> </li>
<li class="span2"> <li class="span3">
<a class="thumbnail" href="http://kippt.com/" target="_blank"> <a class="thumbnail" href="http://kippt.com/" target="_blank">
<img src="assets/img/example-sites/kippt.png" alt="Kippt"> <img src="assets/img/example-sites/kippt.png" alt="Kippt">
</a> </a>
</li> </li>
<li class="span2"> <li class="span3">
<a class="thumbnail" href="http://www.fleetio.com/" target="_blank"> <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
<img src="assets/img/example-sites/fleetio.png" alt="Fleetio"> <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
</a> </a>
</li> </li>
<li class="span2"> <!-- <li class="span2">
<a class="thumbnail" href="http://www.jshint.com/" target="_blank"> <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
<img src="assets/img/example-sites/jshint.png" alt="JS Hint"> <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
</a> </a>
</li> </li>
</ul> --> </ul>
</div><!-- /.marketing --> </div><!-- /.marketing -->

View file

@ -3,73 +3,55 @@
<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">
<ul class="nav nav-pills">
<li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
<li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
<li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
<li><a href="#tabs">{{_i}}Tab{{/i}}</a></li>
<li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li>
<li><a href="#popovers">{{_i}}Popover{{/i}}</a></li>
<li><a href="#alerts">{{_i}}Alert{{/i}}</a></li>
<li><a href="#buttons">{{_i}}Button{{/i}}</a></li>
<li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li>
<li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li>
<li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
</ul>
</div>
</header> </header>
<!-- Using Javascript w/ Bootstrap
================================================== --> <!-- Overview
<section id="javascript"> ================================================== -->
<div class="page-header"> <section id="overview">
<h1>{{_i}}jQuery plugins{{/i}} <small>{{_i}}A dozen Bootstrap plugins to get you started{{/i}}</small></h1> <div class="page-header">
</div> <h1>{{_i}}Javascript in Bootstrap{{/i}}</h1>
<div class="row"> </div>
<div class="span4"> <h3>{{_i}}Individual or compiled{{/i}}</h3>
<h3><a href="./javascript.html#modals">{{_i}}Modals{{/i}}</a></h3> <p>{{_i}}If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.{{/i}}</p>
<p>{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}</p> <h3>{{_i}}Data attributea{{/i}}</h3>
</div> <p>{{_i}}...{{/i}}</p>
<div class="span4"> <h3>{{_i}}Programmatic API{{/i}}</h3>
<h3><a href="./javascript.html#dropdowns">{{_i}}Dropdowns{{/i}}</a></h3> <p>{{_i}}...{{/i}}</p>
<p>{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}</p>
</div>
<div class="span4"> {{! Thought: consider porting much of the JS readme here? }}
<h3><a href="./javascript.html#scrollspy">{{_i}}Scrollspy{{/i}}</a></h3>
<p>{{_i}}Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.{{/i}}</p> </section>
</div>
<div class="span4">
<h3><a href="./javascript.html#tabs">{{_i}}Togglable tabs{{/i}}</a></h3>
<p>{{_i}}Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.{{/i}}</p> <!-- Transitions
</div> ================================================== -->
</div> <!-- /row --> <section id="modals">
<div class="row"> <div class="page-header">
<div class="span4"> <h1>{{_i}}Transitions{{/i}} <small>bootstrap-transition.js</small></h1>
<h3><a href="./javascript.html#tooltips">{{_i}}Tooltips{{/i}}</a></h3> </div>
<p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images&mdash;they use CSS3 for animations and data-attributes for local title storage.{{/i}}</p> <h3>{{_i}}About transitions{{/i}}</h3>
</div> <p>{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}</p>
<div class="span4"> <p class="muted"><strong>*</strong> {{_i}}Required for animation in plugins{{/i}}</p>
<h3><a href="./javascript.html#popovers">{{_i}}Popovers{{/i}}</a> <small class="muted">*</small></h3>
<p>{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}</p>
<p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltips</a> to be included{{/i}}</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#alerts">{{_i}}Alert messages{{/i}}</a></h3>
<p>{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#buttons">{{_i}}Buttons{{/i}}</a></h3>
<p>{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}</p>
</div>
</div> <!-- /row -->
<div class="row" style="margin-bottom: 9px;">
<div class="span4">
<h3><a href="./javascript.html#collapse">{{_i}}Collapse{{/i}}</a></h3>
<p>{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#carousel">{{_i}}Carousel{{/i}}</a></h3>
<p>{{_i}}Create a merry-go-round of any content you wish to provide an interactive slideshow of content.{{/i}}</p>
</div>
<div class="span4">
<h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
<p>{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}</p>
</div>
<div class="span4">
<h3>{{_i}}Transitions{{/i}} <small class="muted">*</small></h3>
<p>{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}</p>
<p class="muted"><strong>*</strong> {{_i}}Required for animation in plugins{{/i}}</p>
</div>
</div> <!-- /row -->
<div class="alert alert-info"><strong>{{_i}}Heads up!{{/i}}</strong> {{_i}} If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.{{/i}}</div>
</section> </section>
@ -83,7 +65,6 @@
<h3>{{_i}}About modals{{/i}}</h3> <h3>{{_i}}About modals{{/i}}</h3>
<p>{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}</p> <p>{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}</p>
<a href="assets/js/bootstrap-modal.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Static example{{/i}}</h2> <h2>{{_i}}Static example{{/i}}</h2>
<p>{{_i}}Below is a statically rendered modal.{{/i}}</p> <p>{{_i}}Below is a statically rendered modal.{{/i}}</p>
@ -273,7 +254,6 @@ $('#myModal').on('hidden', function () {
<h3>{{_i}}About dropdowns{{/i}}</h3> <h3>{{_i}}About dropdowns{{/i}}</h3>
<p>{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}</p> <p>{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}</p>
<a href="assets/js/bootstrap-dropdown.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Examples{{/i}}</h2> <h2>{{_i}}Examples{{/i}}</h2>
<p>{{_i}}Click on the dropdown nav links in the navbar and pills below to test dropdowns.{{/i}}</p> <p>{{_i}}Click on the dropdown nav links in the navbar and pills below to test dropdowns.{{/i}}</p>
@ -416,7 +396,6 @@ $('#myModal').on('hidden', function () {
</div> </div>
<p>{{_i}}The ScrollSpy plugin is for automatically updating nav targets based on scroll position.{{/i}}</p> <p>{{_i}}The ScrollSpy plugin is for automatically updating nav targets based on scroll position.{{/i}}</p>
<a href="assets/js/bootstrap-scrollspy.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Example navbar with scrollspy{{/i}}</h2> <h2>{{_i}}Example navbar with scrollspy{{/i}}</h2>
<p>{{_i}}Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!{{/i}}</p> <p>{{_i}}Scroll the area below and watch the navigation update. The dropdown sub items will be highlighted as well. Try it!{{/i}}</p>
@ -532,7 +511,6 @@ $('[data-spy="scroll"]').each(function () {
</div> </div>
<p>{{_i}}This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.{{/i}}</p> <p>{{_i}}This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.{{/i}}</p>
<a href="assets/js/bootstrap-tab.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Example tabs{{/i}}</h2> <h2>{{_i}}Example tabs{{/i}}</h2>
<p>{{_i}}Click the tabs below to toggle between hidden panes, even via dropdown menus.{{/i}}</p> <p>{{_i}}Click the tabs below to toggle between hidden panes, even via dropdown menus.{{/i}}</p>
@ -648,7 +626,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h3>{{_i}}About Tooltips{{/i}}</h3> <h3>{{_i}}About Tooltips{{/i}}</h3>
<p>{{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.{{/i}}</p> <p>{{_i}}Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use css3 for animations, and data-attributes for local title storage.{{/i}}</p>
<a href="assets/js/bootstrap-tooltip.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Example use of Tooltips{{/i}}</h2> <h2>{{_i}}Example use of Tooltips{{/i}}</h2>
<p>{{_i}}Hover over the links below to see tooltips:{{/i}}</p> <p>{{_i}}Hover over the links below to see tooltips:{{/i}}</p>
@ -755,7 +732,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h3>{{_i}}About popovers{{/i}}</h3> <h3>{{_i}}About popovers{{/i}}</h3>
<p>{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}</p> <p>{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}</p>
<p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltip</a> to be included{{/i}}</p> <p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltip</a> to be included{{/i}}</p>
<a href="assets/js/bootstrap-popover.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Example hover popover{{/i}}</h2> <h2>{{_i}}Example hover popover{{/i}}</h2>
<p>{{_i}}Hover over the button to trigger the popover.{{/i}}</p> <p>{{_i}}Hover over the button to trigger the popover.{{/i}}</p>
@ -864,7 +840,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h3>{{_i}}About alerts{{/i}}</h3> <h3>{{_i}}About alerts{{/i}}</h3>
<p>{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}</p> <p>{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}</p>
<a href="assets/js/bootstrap-alert.js" target="_blank" class="btn">{{_i}}Download{{/i}}</a>
<h2>{{_i}}Example alerts{{/i}}</h2> <h2>{{_i}}Example alerts{{/i}}</h2>
<p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p> <p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p>
@ -935,7 +910,6 @@ $('#my-alert').bind('closed', function () {
<h3>{{_i}}About{{/i}}</h3> <h3>{{_i}}About{{/i}}</h3>
<p>{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}</p> <p>{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}</p>
<a href="assets/js/bootstrap-button.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Example uses{{/i}}</h2> <h2>{{_i}}Example uses{{/i}}</h2>
<p>{{_i}}Use the buttons plugin for states and toggles.{{/i}}</p> <p>{{_i}}Use the buttons plugin for states and toggles.{{/i}}</p>
@ -1030,7 +1004,6 @@ $('#my-alert').bind('closed', function () {
<h3>{{_i}}About{{/i}}</h3> <h3>{{_i}}About{{/i}}</h3>
<p>{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}</p> <p>{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}</p>
<a href="assets/js/bootstrap-collapse.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<p class="muted"><strong>*</strong> {{_i}}Requires the Transitions plugin to be included.{{/i}}</p> <p class="muted"><strong>*</strong> {{_i}}Requires the Transitions plugin to be included.{{/i}}</p>
<h2>{{_i}}Example accordion{{/i}}</h2> <h2>{{_i}}Example accordion{{/i}}</h2>
@ -1179,7 +1152,6 @@ $('#myCollapsible').on('hidden', function () {
<h3>{{_i}}About{{/i}}</h3> <h3>{{_i}}About{{/i}}</h3>
<p>{{_i}}A generic plugin for cycling through elements. A merry-go-round.{{/i}}</p> <p>{{_i}}A generic plugin for cycling through elements. A merry-go-round.{{/i}}</p>
<a href="assets/js/bootstrap-carousel.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Example carousel{{/i}}</h2> <h2>{{_i}}Example carousel{{/i}}</h2>
<p>{{_i}}Watch the slideshow below.{{/i}}</p> <p>{{_i}}Watch the slideshow below.{{/i}}</p>
@ -1313,7 +1285,6 @@ $('.carousel').carousel({
<h3>{{_i}}About{{/i}}</h3> <h3>{{_i}}About{{/i}}</h3>
<p>{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}</p> <p>{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}</p>
<a href="assets/js/bootstrap-typeahead.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<h2>{{_i}}Example{{/i}}</h2> <h2>{{_i}}Example{{/i}}</h2>
<p>{{_i}}Start typing in the field below to show the typeahead results.{{/i}}</p> <p>{{_i}}Start typing in the field below to show the typeahead results.{{/i}}</p>

View file

@ -3,21 +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>
</header> <div class="subnav">
<ul class="nav nav-pills">
<section id="contents">
<div class="bs-docs-contents">
<h3>{{_i}}Contents{{/i}}</h3>
<ol>
<li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li> <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
<li><a href="#variables">{{_i}}Variables{{/i}}</a></li> <li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
<li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li> <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
<li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li> <li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
</ol> </ul>
</div> </div>
</section> </header>

View file

@ -3,6 +3,16 @@
<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">
<ul class="nav nav-pills">
<li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
<li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
<li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
<li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
<li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
<li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
</ul>
</div>
</header> </header>
@ -62,24 +72,22 @@
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div>
<div class="span1">1</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span2">2</div>
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4">4</div> <div class="span4">4</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span8">8</div>
</div>
<div class="row show-grid">
<div class="span6">6</div>
<div class="span6">6</div> <div class="span6">6</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span12">12</div> <div class="span5">5</div>
<div class="span5">5</div>
</div>
<div class="row show-grid">
<div class="span10">10</div>
</div> </div>
</div> </div>
@ -98,14 +106,14 @@
<div class="bs-docs-grid"> <div class="bs-docs-grid">
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4 offset4">4 offset 4</div> <div class="span4 offset2">4 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span3 offset3">3 offset 3</div> <div class="span3 offset2">3 offset 2</div>
<div class="span3 offset3">3 offset 3</div> <div class="span3 offset2">3 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span8 offset4">8 offset 4</div> <div class="span6 offset4">6 offset 4</div>
</div><!-- /row --> </div><!-- /row -->
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
@ -120,13 +128,13 @@
<h3>{{_i}}Example{{/i}}</h3> <h3>{{_i}}Example{{/i}}</h3>
<p>{{_i}}Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.{{/i}}</p> <p>{{_i}}Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.{{/i}}</p>
<div class="row show-grid"> <div class="row show-grid">
<div class="span8"> <div class="span10">
{{_i}}Level 1 of column{{/i}} {{_i}}Level 1 of column{{/i}}
<div class="row show-grid"> <div class="row show-grid">
<div class="span4"> <div class="span5">
{{_i}}Level 2{{/i}} {{_i}}Level 2{{/i}}
</div> </div>
<div class="span4"> <div class="span5">
{{_i}}Level 2{{/i}} {{_i}}Level 2{{/i}}
</div> </div>
</div> </div>
@ -134,11 +142,11 @@
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span8"&gt; &lt;div class="span10"&gt;
{{_i}}Level 1 column{{/i}} {{_i}}Level 1 column{{/i}}
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span4"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt; &lt;div class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;div class="span4"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt; &lt;div class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;

View file

@ -27,84 +27,50 @@
</head> </head>
<body> <body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav"> <!-- Navbar
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> ================================================== -->
<ul class="bs-nav"> <div class="navbar navbar-fixed-top">
<li class=""> <div class="navbar-inner">
<a href="./scaffolding.html">Scaffolding</a> <div class="bs-docs-container">
<ul> <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<li><a href="./scaffolding.html#global">Global styles</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li> <span class="icon-bar"></span>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li> </button>
<li><a href="./scaffolding.html#layouts">Layouts</a></li> <a class="brand" href="./index.html">Bootstrap</a>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <div class="nav-collapse collapse">
</ul> <ul class="nav">
</li> <li class="">
<li class=""> <a href="./index.html">Home</a>
<a href="./base-css.html">Base CSS</a> </li>
<ul> <li class="">
<li><a href="./base-css.html#typography">Typography</a></li> <a href="./scaffolding.html">Scaffolding</a>
<li><a href="./base-css.html#code">Code</a></li> </li>
<li><a href="./base-css.html#tables">Tables</a></li> <li class="">
<li><a href="./base-css.html#forms">Forms</a></li> <a href="./base-css.html">Base CSS</a>
<li><a href="./base-css.html#buttons">Buttons</a></li> </li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li class="">
</ul> <a href="./components.html">Components</a>
</li> </li>
<li class=""> <li class="">
<a href="./components.html">Components</a> <a href="./javascript.html">Javascript</a>
<ul> </li>
<li><a href="./components.html#buttonGroups">Button groups</a></li> <li class="">
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li> <a href="./less.html">LESS</a>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li> </li>
<li><a href="./components.html#navbar">Navbar</a></li> <li class="divider-vertical"></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li> <li class="">
<li><a href="./components.html#pagination">Pagination</a></li> <a href="./download.html">Customize</a>
<li><a href="./components.html#labels">Labels</a></li> </li>
<li><a href="./components.html#badges">Badges</a></li> <li class="">
<li><a href="./components.html#typography">Typography</a></li> <a href="./examples.html">Examples</a>
<li><a href="./components.html#thumbnails">Thumbnails</a></li> </li>
<li><a href="./components.html#alerts">Alerts</a></li> </ul>
<li><a href="./components.html#progress">Progress bars</a></li> </div>
<li><a href="./components.html#misc">Miscellaneous</a></li> </div>
</ul> </div>
</li>
<li class="">
<a href="./javascript.html">Javascript</a>
<ul>
<li><a href="./javascript.html#javascript">All plugins</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
<li><a href="./javascript.html#tabs">Tab</a></li>
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
<li><a href="./javascript.html#popovers">Popover</a></li>
<li><a href="./javascript.html#alerts">Alert</a></li>
<li><a href="./javascript.html#buttons">Button</a></li>
<li><a href="./javascript.html#collapse">Collapse</a></li>
<li><a href="./javascript.html#carousel">Carousel</a></li>
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
</ul>
</li>
<li class="">
<a href="./less.html">LESS</a>
<ul>
<li><a href="./less.html#builtWith">Built with Less</a></li>
<li><a href="./less.html#variables">Variables</a></li>
<li><a href="./less.html#mixins">Mixins</a></li>
<li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
</ul>
</li>
<li class="">
<a href="./download.html">Customize</a>
</li>
<li class="">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div> </div>
<div class="bs-docs-container"> <div class="bs-docs-container">
@ -314,7 +280,7 @@
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer> </footer>
</div><!-- /container --> </div>

View file

@ -11,9 +11,6 @@
.border-radius(4px); .border-radius(4px);
color: @warningText; color: @warningText;
} }
.alert-heading {
color: inherit;
}
// Adjust close link position // Adjust close link position
.alert .close { .alert .close {
@ -28,7 +25,7 @@
.alert-success { .alert-success {
background-color: @successBackground; background-color: @successBackground;
border-color: @successBorder; border-color: @successBorder;
color: @successText; color: @successText;
} }
.alert-danger, .alert-danger,