Skip to content

B
bootstrap
Commit 97cbefa7 authored by Marcus Schwab's avatar Marcus Schwab
Browse files
Options

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

parents bd19b42c a0cd886c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4054 additions and 3937 deletions
docs/assets/css/bootstrap.css
View file @ 97cbefa7
......@@ -3169,10 +3169,6 @@ input[type="submit"].btn.btn-mini {
border-radius: 4px;
}
.alert-heading {
color: inherit;
}
.alert .close {
position: relative;
top: -2px;
......
docs/assets/css/docs.css
View file @ 97cbefa7
......@@ -12,18 +12,18 @@
body {
position: relative;
padding-top: 40px;
padding-top: 100px;
font-size: 14px;
background-color: #fff;
background-image: url(../img/grid-20px.png);
background-repeat: repeat-x;
background-position: 0 0;
background-position: 0 40px;
}
/* Custom container for the narrow docs */
.bs-docs-container {
max-width: 780px;
margin: 0 0 0 240px;
margin: 0 auto;
}
/* Increase docs base type size and line-heights */
......@@ -37,12 +37,44 @@ li {
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
-------------------------------------------------- */
.bs-docs-nav {
display: none;
position: fixed;
top: 0;
left: 0;
......@@ -149,6 +181,7 @@ hr.soften {
------------------------- */
.jumbotron {
position: relative;
text-align: center;
}
.jumbotron h1 {
margin-bottom: 10px;
......@@ -177,7 +210,8 @@ hr.soften {
/* Masthead (docs home)
------------------------- */
.masthead {
margin-bottom: 60px;
margin-top: 20px;
margin-bottom: 80px;
}
.masthead h1,
.masthead p {
......@@ -224,12 +258,16 @@ hr.soften {
------------------------- */
/* supporting docs pages */
.subhead {
text-align: left;
}
.subhead h1 {
font-size: 60px;
}
.subhead .lead {
margin-bottom: 30px;
line-height: 25px;
font-size: 30px;
line-height: 40px;
}
/* Subnav */
......@@ -314,7 +352,7 @@ hr.soften {
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
}
.subnav-fixed .nav {
width: 938px;
max-width: 780px;
margin: 0 auto;
padding: 0 1px;
}
......@@ -338,6 +376,7 @@ hr.soften {
margin: 36px 0 27px;
font-size: 40px;
font-weight: 300;
text-align: center;
}
.marketing h2,
.marketing h3 {
......@@ -364,6 +403,7 @@ hr.soften {
font-weight: 300;
line-height: 24px;
color: #999;
text-align: center;
}
......@@ -421,8 +461,12 @@ hr.soften {
-moz-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 {
height: 240px;
margin-bottom: 20px;
padding: 9px;
}
......@@ -435,7 +479,6 @@ hr.soften {
background-color: #dceaf4;
margin: 0 auto;
width: 70%;
height: 240px;
}
.mini-layout.fluid .mini-layout-sidebar,
.mini-layout.fluid .mini-layout-header,
......@@ -445,7 +488,6 @@ hr.soften {
.mini-layout.fluid .mini-layout-sidebar {
background-color: #bbd8e9;
width: 20%;
height: 240px;
}
.mini-layout.fluid .mini-layout-body {
width: 77.5%;
......@@ -598,6 +640,9 @@ h2 + .row {
}
/* Example sites showcase */
.example-sites {
margin-left: 20px;
}
.example-sites img {
max-width: 100%;
margin: 0 auto;
......@@ -694,9 +739,45 @@ form.well {
.bs-docs-example p:last-child {
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;
}
.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 {
padding-bottom: 19px;
}
......@@ -772,13 +853,6 @@ form.bs-docs-example {
border: 1px solid #d6e9c6;
}
/* Grid examples
------------------------- */
.bs-docs-grid {
width: 940px;
margin-left: -80px;
}
/* Responsive Docs
......@@ -886,7 +960,7 @@ form.bs-docs-example {
/* Jumbotron buttons */
.jumbotron .btn {
margin-bottom: 10px;
}
av }
/* Subnav */
.subnav {
......@@ -988,14 +1062,13 @@ form.bs-docs-example {
/* LARGE DESKTOP SCREENS */
@media (min-width: 1210px) {
/* Update subnav container */
.subnav-fixed .nav {
width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */
.bs-docs-container {
max-width: 970px;
}
.bs-docs-grid {
width: 1170px;
margin-left: -195px;
/* Update subnav container */
.subnav-fixed .nav {
max-width: 970px; /* 2px less to account for left/right borders being removed when in fixed mode */
}
}
docs/base-css.html
View file @ 97cbefa7
This diff is collapsed.
docs/components.html
View file @ 97cbefa7
This diff is collapsed.
docs/download.html
View file @ 97cbefa7
......@@ -27,77 +27,40 @@
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
<ul class="bs-nav">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="bs-docs-container">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Home</a>
</li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
<ul>
<li><a href="./scaffolding.html#global">Global styles</a></li>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
<ul>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#code">Code</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul>
</li>
<li class="">
<a href="./components.html">Components</a>
<ul>
<li><a href="./components.html#buttonGroups">Button groups</a></li>
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
<li><a href="./components.html#navbar">Navbar</a></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#labels">Labels</a></li>
<li><a href="./components.html#badges">Badges</a></li>
<li><a href="./components.html#typography">Typography</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alerts</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
<li><a href="./components.html#misc">Miscellaneous</a></li>
</ul>
</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="divider-vertical"></li>
<li class="active">
<a href="./download.html">Customize</a>
</li>
......@@ -106,6 +69,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="bs-docs-container">
......@@ -114,22 +80,18 @@
<header class="jumbotron subhead" id="overview">
<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>
<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>
<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>
<section class="download" id="components">
<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>
</footer>
</div><!-- /container -->
</div>
......
docs/examples.html
View file @ 97cbefa7
......@@ -27,77 +27,40 @@
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
<ul class="bs-nav">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="bs-docs-container">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Home</a>
</li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
<ul>
<li><a href="./scaffolding.html#global">Global styles</a></li>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
<ul>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#code">Code</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul>
</li>
<li class="">
<a href="./components.html">Components</a>
<ul>
<li><a href="./components.html#buttonGroups">Button groups</a></li>
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
<li><a href="./components.html#navbar">Navbar</a></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#labels">Labels</a></li>
<li><a href="./components.html#badges">Badges</a></li>
<li><a href="./components.html#typography">Typography</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alerts</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
<li><a href="./components.html#misc">Miscellaneous</a></li>
</ul>
</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="divider-vertical"></li>
<li class="">
<a href="./download.html">Customize</a>
</li>
......@@ -106,6 +69,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
<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>
</footer>
</div><!-- /container -->
</div>
......
docs/index.html
View file @ 97cbefa7
......@@ -27,77 +27,40 @@
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
<ul class="bs-nav">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="bs-docs-container">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="active">
<a href="./index.html">Home</a>
</li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
<ul>
<li><a href="./scaffolding.html#global">Global styles</a></li>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
<ul>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#code">Code</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul>
</li>
<li class="">
<a href="./components.html">Components</a>
<ul>
<li><a href="./components.html#buttonGroups">Button groups</a></li>
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
<li><a href="./components.html#navbar">Navbar</a></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#labels">Labels</a></li>
<li><a href="./components.html#badges">Badges</a></li>
<li><a href="./components.html#typography">Typography</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alerts</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
<li><a href="./components.html#misc">Miscellaneous</a></li>
</ul>
</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="divider-vertical"></li>
<li class="">
<a href="./download.html">Customize</a>
</li>
......@@ -106,6 +69,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="bs-docs-container">
......@@ -152,7 +118,7 @@
<h1>Designed for everyone, everywhere.</h1>
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
<div class="row">
<div class="span4">
<div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
<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>
......@@ -169,7 +135,7 @@
<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>
</div>
<div class="span4">
<div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
<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>
......@@ -193,27 +159,27 @@
<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>
<ul class="thumbnails example-sites">
<li class="span2">
<li class="span3">
<a class="thumbnail" href="http://soundready.fm/" target="_blank">
<img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
</a>
</li>
<li class="span2">
<li class="span3">
<a class="thumbnail" href="http://kippt.com/" target="_blank">
<img src="assets/img/example-sites/kippt.png" alt="Kippt">
</a>
</li>
<li class="span2">
<li class="span3">
<a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
<img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
</a>
</li>
<li class="span2">
<!-- <li class="span2">
<a class="thumbnail" href="http://www.jshint.com/" target="_blank">
<img src="assets/img/example-sites/jshint.png" alt="JS Hint">
</a>
</li>
</ul>
--> </ul>
</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>
</footer>
</div><!-- /container -->
</div>
......
docs/javascript.html
View file @ 97cbefa7
This diff is collapsed.
docs/less.html
View file @ 97cbefa7
......@@ -27,77 +27,40 @@
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
<ul class="bs-nav">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="bs-docs-container">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Home</a>
</li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
<ul>
<li><a href="./scaffolding.html#global">Global styles</a></li>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
<ul>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#code">Code</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul>
</li>
<li class="">
<a href="./components.html">Components</a>
<ul>
<li><a href="./components.html#buttonGroups">Button groups</a></li>
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
<li><a href="./components.html#navbar">Navbar</a></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#labels">Labels</a></li>
<li><a href="./components.html#badges">Badges</a></li>
<li><a href="./components.html#typography">Typography</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alerts</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
<li><a href="./components.html#misc">Miscellaneous</a></li>
</ul>
</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="divider-vertical"></li>
<li class="">
<a href="./download.html">Customize</a>
</li>
......@@ -106,6 +69,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="bs-docs-container">
......@@ -114,21 +80,15 @@
<header class="jumbotron subhead" id="overview">
<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>
</header>
<section id="contents">
<div class="bs-docs-contents">
<h3>Contents</h3>
<ol>
<div class="subnav">
<ul class="nav nav-pills">
<li><a href="#builtWith">Built with Less</a></li>
<li><a href="#variables">Variables</a></li>
<li><a href="#mixins">Mixins</a></li>
<li><a href="#compiling">Compiling Bootstrap</a></li>
</ol>
</ul>
</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>
</footer>
</div><!-- /container -->
</div>
......
docs/scaffolding.html
View file @ 97cbefa7
......@@ -27,77 +27,40 @@
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
<ul class="bs-nav">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="bs-docs-container">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Home</a>
</li>
<li class="active">
<a href="./scaffolding.html">Scaffolding</a>
<ul>
<li><a href="./scaffolding.html#global">Global styles</a></li>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
<ul>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#code">Code</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul>
</li>
<li class="">
<a href="./components.html">Components</a>
<ul>
<li><a href="./components.html#buttonGroups">Button groups</a></li>
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
<li><a href="./components.html#navbar">Navbar</a></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#labels">Labels</a></li>
<li><a href="./components.html#badges">Badges</a></li>
<li><a href="./components.html#typography">Typography</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alerts</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
<li><a href="./components.html#misc">Miscellaneous</a></li>
</ul>
</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="divider-vertical"></li>
<li class="">
<a href="./download.html">Customize</a>
</li>
......@@ -106,6 +69,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="bs-docs-container">
......@@ -114,6 +80,16 @@
<header class="jumbotron subhead" id="overview">
<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>
<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>
......@@ -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>
<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>
<div class="row show-grid">
<div class="span4">4</div>
<div class="span8">8</div>
<div class="span6">6</div>
</div>
<div class="row show-grid">
<div class="span6">6</div>
<div class="span6">6</div>
<div class="span5">5</div>
<div class="span5">5</div>
</div>
<div class="row show-grid">
<div class="span12">12</div>
<div class="span10">10</div>
</div>
</div>
......@@ -209,14 +183,14 @@
<div class="bs-docs-grid">
<div class="row show-grid">
<div class="span4">4</div>
<div class="span4 offset4">4 offset 4</div>
<div class="span4 offset2">4 offset 2</div>
</div><!-- /row -->
<div class="row show-grid">
<div class="span3 offset3">3 offset 3</div>
<div class="span3 offset3">3 offset 3</div>
<div class="span3 offset2">3 offset 2</div>
<div class="span3 offset2">3 offset 2</div>
</div><!-- /row -->
<div class="row show-grid">
<div class="span8 offset4">8 offset 4</div>
<div class="span6 offset4">6 offset 4</div>
</div><!-- /row -->
</div>
<pre class="prettyprint linenums">
......@@ -231,13 +205,13 @@
<h3>Example</h3>
<p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p>
<div class="row show-grid">
<div class="span8">
<div class="span10">
Level 1 of column
<div class="row show-grid">
<div class="span4">
<div class="span5">
Level 2
</div>
<div class="span4">
<div class="span5">
Level 2
</div>
</div>
......@@ -245,11 +219,11 @@
</div>
<pre class="prettyprint linenums">
&lt;div class="row"&gt;
&lt;div class="span8"&gt;
&lt;div class="span10"&gt;
Level 1 column
&lt;div class="row"&gt;
&lt;div class="span4"&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 class="span5"&gt;Level 2&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>
</footer>
</div><!-- /container -->
</div>
......
docs/templates/layout.mustache
View file @ 97cbefa7
......@@ -39,77 +39,40 @@
{{/production}}
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">{{_i}}Bootstrap{{/i}}</a></h3>
<ul class="bs-nav">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="bs-docs-container">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="{{index}}">
<a href="./index.html">{{_i}}Home{{/i}}</a>
</li>
<li class="{{scaffolding}}">
<a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
<ul>
<li><a href="./scaffolding.html#global">{{_i}}Global styles{{/i}}</a></li>
<li><a href="./scaffolding.html#gridSystem">{{_i}}Grid system{{/i}}</a></li>
<li><a href="./scaffolding.html#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
<li><a href="./scaffolding.html#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
<li><a href="./scaffolding.html#layouts">{{_i}}Layouts{{/i}}</a></li>
<li><a href="./scaffolding.html#responsive">{{_i}}Responsive design{{/i}}</a></li>
</ul>
</li>
<li class="{{base-css}}">
<a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
<ul>
<li><a href="./base-css.html#typography">{{_i}}Typography{{/i}}</a></li>
<li><a href="./base-css.html#code">{{_i}}Code{{/i}}</a></li>
<li><a href="./base-css.html#tables">{{_i}}Tables{{/i}}</a></li>
<li><a href="./base-css.html#forms">{{_i}}Forms{{/i}}</a></li>
<li><a href="./base-css.html#buttons">{{_i}}Buttons{{/i}}</a></li>
<li><a href="./base-css.html#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li>
</ul>
</li>
<li class="{{components}}">
<a href="./components.html">{{_i}}Components{{/i}}</a>
<ul>
<li><a href="./components.html#buttonGroups">{{_i}}Button groups{{/i}}</a></li>
<li><a href="./components.html#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li>
<li><a href="./components.html#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li>
<li><a href="./components.html#navbar">{{_i}}Navbar{{/i}}</a></li>
<li><a href="./components.html#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li>
<li><a href="./components.html#pagination">{{_i}}Pagination{{/i}}</a></li>
<li><a href="./components.html#labels">{{_i}}Labels{{/i}}</a></li>
<li><a href="./components.html#badges">{{_i}}Badges{{/i}}</a></li>
<li><a href="./components.html#typography">{{_i}}Typography{{/i}}</a></li>
<li><a href="./components.html#thumbnails">{{_i}}Thumbnails{{/i}}</a></li>
<li><a href="./components.html#alerts">{{_i}}Alerts{{/i}}</a></li>
<li><a href="./components.html#progress">{{_i}}Progress bars{{/i}}</a></li>
<li><a href="./components.html#misc">{{_i}}Miscellaneous{{/i}}</a></li>
</ul>
</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="divider-vertical"></li>
<li class="{{download}}">
<a href="./download.html">{{_i}}Customize{{/i}}</a>
</li>
......@@ -118,6 +81,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
<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>
</footer>
</div><!-- /container -->
</div>{{! /container }}
......
docs/templates/pages/base-css.mustache
View file @ 97cbefa7
This diff is collapsed.
docs/templates/pages/components.mustache
View file @ 97cbefa7
This diff is collapsed.
docs/templates/pages/download.mustache
View file @ 97cbefa7
......@@ -3,22 +3,18 @@
<header class="jumbotron subhead" id="overview">
<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>
<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>
<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>
<section class="download" id="components">
<div class="page-header">
......
docs/templates/pages/index.mustache
View file @ 97cbefa7
......@@ -41,7 +41,7 @@
<h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
<p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
<div class="row">
<div class="span4">
<div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
<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>
......@@ -58,7 +58,7 @@
<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>
</div>
<div class="span4">
<div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
<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>
......@@ -82,26 +82,26 @@
<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>
<ul class="thumbnails example-sites">
<li class="span2">
<li class="span3">
<a class="thumbnail" href="http://soundready.fm/" target="_blank">
<img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
</a>
</li>
<li class="span2">
<li class="span3">
<a class="thumbnail" href="http://kippt.com/" target="_blank">
<img src="assets/img/example-sites/kippt.png" alt="Kippt">
</a>
</li>
<li class="span2">
<li class="span3">
<a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
<img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
</a>
</li>
<li class="span2">
<!-- <li class="span2">
<a class="thumbnail" href="http://www.jshint.com/" target="_blank">
<img src="assets/img/example-sites/jshint.png" alt="JS Hint">
</a>
</li>
</ul>
--> </ul>
</div><!-- /.marketing -->
docs/templates/pages/javascript.mustache
View file @ 97cbefa7
This diff is collapsed.
docs/templates/pages/less.mustache
View file @ 97cbefa7
......@@ -3,21 +3,15 @@
<header class="jumbotron subhead" id="overview">
<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>
</header>
<section id="contents">
<div class="bs-docs-contents">
<h3>{{_i}}Contents{{/i}}</h3>
<ol>
<div class="subnav">
<ul class="nav nav-pills">
<li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
<li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
<li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
<li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
</ol>
</ul>
</div>
</section>
</header>
......
docs/templates/pages/scaffolding.mustache
View file @ 97cbefa7
......@@ -3,6 +3,16 @@
<header class="jumbotron subhead" id="overview">
<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>
<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>
......@@ -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>
<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>
<div class="row show-grid">
<div class="span4">4</div>
<div class="span8">8</div>
<div class="span6">6</div>
</div>
<div class="row show-grid">
<div class="span6">6</div>
<div class="span6">6</div>
<div class="span5">5</div>
<div class="span5">5</div>
</div>
<div class="row show-grid">
<div class="span12">12</div>
<div class="span10">10</div>
</div>
</div>
......@@ -98,14 +106,14 @@
<div class="bs-docs-grid">
<div class="row show-grid">
<div class="span4">4</div>
<div class="span4 offset4">4 offset 4</div>
<div class="span4 offset2">4 offset 2</div>
</div><!-- /row -->
<div class="row show-grid">
<div class="span3 offset3">3 offset 3</div>
<div class="span3 offset3">3 offset 3</div>
<div class="span3 offset2">3 offset 2</div>
<div class="span3 offset2">3 offset 2</div>
</div><!-- /row -->
<div class="row show-grid">
<div class="span8 offset4">8 offset 4</div>
<div class="span6 offset4">6 offset 4</div>
</div><!-- /row -->
</div>
<pre class="prettyprint linenums">
......@@ -120,13 +128,13 @@
<h3>{{_i}}Example{{/i}}</h3>
<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="span8">
<div class="span10">
{{_i}}Level 1 of column{{/i}}
<div class="row show-grid">
<div class="span4">
<div class="span5">
{{_i}}Level 2{{/i}}
</div>
<div class="span4">
<div class="span5">
{{_i}}Level 2{{/i}}
</div>
</div>
......@@ -134,11 +142,11 @@
</div>
<pre class="prettyprint linenums">
&lt;div class="row"&gt;
&lt;div class="span8"&gt;
&lt;div class="span10"&gt;
{{_i}}Level 1 column{{/i}}
&lt;div class="row"&gt;
&lt;div class="span4"&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 class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
......
docs/upgrading.html
View file @ 97cbefa7
......@@ -27,77 +27,40 @@
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
<ul class="bs-nav">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="bs-docs-container">
<button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Home</a>
</li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
<ul>
<li><a href="./scaffolding.html#global">Global styles</a></li>
<li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
<li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
<li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
<ul>
<li><a href="./base-css.html#typography">Typography</a></li>
<li><a href="./base-css.html#code">Code</a></li>
<li><a href="./base-css.html#tables">Tables</a></li>
<li><a href="./base-css.html#forms">Forms</a></li>
<li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul>
</li>
<li class="">
<a href="./components.html">Components</a>
<ul>
<li><a href="./components.html#buttonGroups">Button groups</a></li>
<li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
<li><a href="./components.html#navbar">Navbar</a></li>
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
<li><a href="./components.html#pagination">Pagination</a></li>
<li><a href="./components.html#labels">Labels</a></li>
<li><a href="./components.html#badges">Badges</a></li>
<li><a href="./components.html#typography">Typography</a></li>
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
<li><a href="./components.html#alerts">Alerts</a></li>
<li><a href="./components.html#progress">Progress bars</a></li>
<li><a href="./components.html#misc">Miscellaneous</a></li>
</ul>
</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="divider-vertical"></li>
<li class="">
<a href="./download.html">Customize</a>
</li>
......@@ -106,6 +69,9 @@
</li>
</ul>
</div>
</div>
</div>
</div>
<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>
</footer>
</div><!-- /container -->
</div>
......
less/alerts.less
View file @ 97cbefa7
......@@ -11,9 +11,6 @@
.border-radius(4px);
color: @warningText;
}
.alert-heading {
color: inherit;
}
// Adjust close link position
.alert .close {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment