aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-12 21:38:18 -0700
committerMark Otto <[email protected]>2012-07-12 21:38:18 -0700
commit9343e1e933c1a38ec4cc58024b01edda631863b0 (patch)
treea68f2297cbb49c944af0787ba802236bcc5c6153 /docs
parenta12f0e551f7da763a9be23013d1b51c161a0f6f8 (diff)
downloadbootstrap-9343e1e933c1a38ec4cc58024b01edda631863b0.tar.xz
bootstrap-9343e1e933c1a38ec4cc58024b01edda631863b0.zip
remove getting started link from home, add to navbar, overhaul getting started docs
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/docs.css10
-rw-r--r--docs/base-css.html3
-rw-r--r--docs/components.html3
-rw-r--r--docs/download.html3
-rw-r--r--docs/examples.html3
-rw-r--r--docs/extend.html3
-rw-r--r--docs/getting-started.html275
-rw-r--r--docs/index.html4
-rw-r--r--docs/javascript.html3
-rw-r--r--docs/scaffolding.html3
-rw-r--r--docs/templates/layout.mustache3
-rw-r--r--docs/templates/pages/getting-started.mustache291
-rw-r--r--docs/templates/pages/index.mustache1
-rw-r--r--docs/upgrading.html3
14 files changed, 342 insertions, 266 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 35eb7b83c..0a713d626 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -95,9 +95,9 @@ hr.soften {
background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */
background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */
- -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
- -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
- box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+ -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15);
+ -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15);
+ box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15);
}
.jumbotron h1 {
@@ -209,7 +209,7 @@ hr.soften {
font-size: 60px;
}
.subhead p {
- margin-bottom: 10px;
+ margin-bottom: 20px;
}
.subhead .navbar {
display: none;
@@ -915,5 +915,3 @@ form.bs-docs-example {
}
}
-
-
diff --git a/docs/base-css.html b/docs/base-css.html
index fc04ea4c2..289745397 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -46,6 +46,9 @@
<a href="./index.html">Home</a>
</li>
<li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="active">
diff --git a/docs/components.html b/docs/components.html
index ca8cfe2dd..a48037a2d 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -46,6 +46,9 @@
<a href="./index.html">Home</a>
</li>
<li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
diff --git a/docs/download.html b/docs/download.html
index 2573b45c9..9c637ca2c 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -46,6 +46,9 @@
<a href="./index.html">Home</a>
</li>
<li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
diff --git a/docs/examples.html b/docs/examples.html
index 4dd06b14a..1b16f378c 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -46,6 +46,9 @@
<a href="./index.html">Home</a>
</li>
<li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
diff --git a/docs/extend.html b/docs/extend.html
index 3ea7953fd..8f8f548be 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -46,6 +46,9 @@
<a href="./index.html">Home</a>
</li>
<li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
diff --git a/docs/getting-started.html b/docs/getting-started.html
index c0e99542e..eb6358d86 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -45,6 +45,9 @@
<li class="">
<a href="./index.html">Home</a>
</li>
+ <li class="active">
+ <a href="./getting-started.html">Get started</a>
+ </li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
@@ -66,155 +69,179 @@
</div>
</div>
-</div>
-<!-- Masthead
+<!-- Subhead
================================================== -->
<header class="jumbotron subhead" id="overview">
<div class="container">
- <h1>Getting started</h1>
- <p class="lead">Overview of the project, it's contents, and how to get started with a simple template.</p>
-</div>
+ <h1>Getting started</h1>
+ <p class="lead">Overview of the project, it's contents, and how to get started with a simple template.</p>
+ </div>
</header>
<div class="container">
-<div class="row">
- <div class="span3 bs-docs-sidebar">
- <ul class="nav nav-list bs-docs-sidenav">
- <li><a href="#prerequisites">Prerequisites <i class="icon-chevron-right"></i></a></li>
- <li><a href="#file-structure">File structure <i class="icon-chevron-right"></i></a></li>
- <li><a href="#contents">What's included <i class="icon-chevron-right"></i></a></li>
- <li><a href="#html-template">HTML template <i class="icon-chevron-right"></i></a></li>
- </ul>
- </div>
- <div class="span9">
- <section id="prerequisites">
- <div class="page-header">
- <h1>Prerequisites</h1>
- </div>
- <p>Before getting started, you need the following:</p>
- <ul>
- <li>An unzipped copy of the <a href="https://github.com/twitter/bootstrap/zipball/master">latest version of Bootstrap</a> (which includes all CSS, JavaScript, and images).</li>
- <li>An editor of your choice for writing code (I recommend <a href="http://sublimetext.com/2">Sublime Text 2</a>).</li>
- <li>Some working knowledge of HTML and CSS.</li>
+ <div class="row">
+ <div class="span3 bs-docs-sidebar">
+ <ul class="nav nav-list bs-docs-sidenav">
+ <li><a href="#download-bootstrap">Download <i class="icon-chevron-right"></i></a></li>
+ <li><a href="#file-structure">File structure <i class="icon-chevron-right"></i></a></li>
+ <li><a href="#contents">What's included <i class="icon-chevron-right"></i></a></li>
+ <li><a href="#html-template">HTML template <i class="icon-chevron-right"></i></a></li>
</ul>
- <p>When ready, proceed to the next section, <a href="#file-structure">File structure</a>.</p>
- </section>
+ </div>
+ <div class="span9">
- <section id="file-structure">
- <div class="page-header">
- <h1>File structure</h1>
- </div>
- <p>Once unzipped, the structure of Bootstrap&rsquo;s files looks like this:</p>
- <ul>
- <li>bootstrap/
- <ul>
- <li>css/
- <ul>
- <li>bootstrap.css</li>
- <li>bootstrap.min.css</li>
- </ul>
- </li>
- <li>js/
- <ul>
- <li>bootstrap.js</li>
- <li>bootstrap.min.js</li>
- </ul>
- </li>
- <li>img/
- <ul>
- <li>glyphicons-halflings.png</li>
- <li>glyphicons-halflings-white.png</li>
- </ul>
- </li>
- <li>README.md</li>
- </ul>
- </li>
- </ul>
- <p>This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). The image files are compressed using <a href="http://imageoptim.com/">ImageOptim</a>, a Mac app for compressing PNGs.</p>
- </section>
+ <!-- Download
+ ================================================== -->
+ <section id="download-bootstrap">
+ <div class="page-header">
+ <h1>1. Download</h1>
+ </div>
+ <p class="lead">Before downloading, be sure to have a code editor (we recommend <a href="http://sublimetext.com/2">Sublime Text 2</a>) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.</p>
+ <div class="row">
+ <div class="span4">
+ <h3>Download compiled</h3>
+ <p><strong>Fastest way to get started:</strong> get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.</p>
+ <a class="btn btn-large btn-primary">Download Bootstrap</a>
+ </div>
+ <div class="span4">
+ <h3>Download source</h3>
+ <p>Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
+ <a class="btn btn-large">Download Bootstrap source</a>
+ </div>
+ </div>
+ </section>
- <section id="contents">
- <div class="page-header">
- <h1>What's included</h1>
- </div>
- <p>Bootstrap comes equipped with CSS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>:</p>
- <ul>
- <li><strong><a href="http://twitter.github.com/bootstrap/scaffolding.html">Scaffolding:</a></strong> Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.</li>
- <li><strong><a href="http://twitter.github.com/bootstrap/base-css.html">Base CSS:</a></strong> Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes <a href="http://glyphicons.com">Glyphicons</a>, a great little icon set.</li>
- <li><strong><a href="http://twitter.github.com/bootstrap/components.html">Components:</a></strong> Basic styles for common interface components like tabs and pills, navbar, page headers, and more.</li>
- <li><strong><a href="http://twitter.github.com/bootstrap/javascript.html">Javascript plugins:</a></strong> Similar to the Components section, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.</li>
- </ul>
- <p>Together, the <strong>Components</strong> and <strong>Javascript plugins</strong> sections provide the following interface elements:</p>
- <ul>
- <li>Button groups</li>
- <li>Button dropdowns</li>
- <li>Navigational tabs, pills, and lists</li>
- <li>Navbar</li>
- <li>Labels</li>
- <li>Badges</li>
- <li>Page headers and hero unit</li>
- <li>Thumbnails</li>
- <li>Alerts</li>
- <li>Progress bars</li>
- <li>Modals</li>
- <li>Dropdowns</li>
- <li>Tooltips</li>
- <li>Popovers</li>
- <li>Accordion</li>
- <li>Carousel</li>
- <li>Typeahead</li>
- </ul>
- <p>In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.</p>
- </section>
+ <!-- File structure
+ ================================================== -->
+ <section id="file-structure">
+ <div class="page-header">
+ <h1>2. File structure</h1>
+ </div>
+ <p>Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:</p>
+<pre class="prettyprint">
+ bootstrap/
+ ├── css/
+ │ ├── bootstrap.css
+ │ ├── bootstrap.min.css
+ ├── js/
+ │ ├── bootstrap.js
+ │ ├── bootstrap.min.js
+ ├── img/
+ │ ├── glyphicons-halflings.png
+ │ ├── glyphicons-halflings-white.png
+ └── README.md
+</pre>
+ <p>This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). The image files are compressed using <a href="http://imageoptim.com/">ImageOptim</a>, a Mac app for compressing PNGs.</p>
+ </section>
- <section id="html-template">
- <div class="page-header">
- <h1>Basic HTML template</h1>
- </div>
- <p>Now that we&rsquo;ve got the basic information on Bootstrap out of the way, we can focus on getting started. To do that, we&rsquo;ll utilize a basic HTML template that includes everything we&rsquo;ve mentioned in the <a href="#file-structure">File structure</a>.</p>
- <p>As previously mentioned, we won&rsquo;t cover the basics of writing HTML and CSS here. Instead, we&rsquo;ll leapfrog through various points in web development complexity to give you the broadest and most complete overview.</p>
- <p>Now, here&rsquo;s a look at a <strong>typical HTML file</strong>:</p>
- <pre class="prettyprint linenums">
- &lt;html&gt;
- &lt;head&gt;
- &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
- &lt;/head&gt;
- &lt;body&gt;
- &lt;h1&gt;Hello, world!&lt;/h1&gt;
- &lt;/body&gt;
- &lt;/html&gt;
- </pre>
- <p>To make this <strong>a Bootstrapped template</strong>, just include the appropriate CSS and JS files:</p>
- <pre class="prettyprint linenums">
- &lt;html&gt;
- &lt;head&gt;
- &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
- &lt;!-- Bootstrap --&gt;
- &lt;link href="css/bootstrap.min.css" rel="stylesheet"&gt;
- &lt;script src="js/bootstrap.min.js"&gt;&lt;/script&gt;
- &lt;/head&gt;
- &lt;body&gt;
- &lt;h1&gt;Hello, world!&lt;/h1&gt;
- &lt;/body&gt;
- &lt;/html&gt;
- </pre>
- <p>And you&rsquo;re set. With those two files added, you can begin to write Bootstrap-friendly HTML, CSS, and JS to build any site or application you like. Head to the Bootstrap docs for information, examples, and even code snippets for the Bootstrap grid system, base HTML styles, components, and even responsive features.</p>
- </section>
+
+ <!-- Contents
+ ================================================== -->
+ <section id="contents">
+ <div class="page-header">
+ <h1>3. What's included</h1>
+ </div>
+ <p>Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.</p>
+
+ <h4><a href="http://twitter.github.com/bootstrap/scaffolding.html">Scaffolding</a></h4>
+ <p>Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.</p>
+
+ <h4><a href="http://twitter.github.com/bootstrap/base-css.html">Base CSS</a></h4>
+ <p>Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes <a href="http://glyphicons.com">Glyphicons</a>, a great little icon set.</p>
+
+ <h4><a href="http://twitter.github.com/bootstrap/components.html">Components</a></h4>
+ <p>Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.</p>
+
+ <h4><a href="http://twitter.github.com/bootstrap/javascript.html">Javascript plugins</a></h4>
+ <p>Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.</p>
+
+ <hr>
+
+ <h3>List of components</h3>
+ <p>Together, the <strong>Components</strong> and <strong>Javascript plugins</strong> sections provide the following interface elements:</p>
+ <ul>
+ <li>Button groups</li>
+ <li>Button dropdowns</li>
+ <li>Navigational tabs, pills, and lists</li>
+ <li>Navbar</li>
+ <li>Labels</li>
+ <li>Badges</li>
+ <li>Page headers and hero unit</li>
+ <li>Thumbnails</li>
+ <li>Alerts</li>
+ <li>Progress bars</li>
+ <li>Modals</li>
+ <li>Dropdowns</li>
+ <li>Tooltips</li>
+ <li>Popovers</li>
+ <li>Accordion</li>
+ <li>Carousel</li>
+ <li>Typeahead</li>
+ </ul>
+ <p>In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.</p>
+ </section>
+ <!-- HTML template
+ ================================================== -->
+ <section id="html-template">
+ <div class="page-header">
+ <h1>4. Basic HTML template</h1>
+ </div>
+ <p>With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.</p>
+ <p>Now, here's a look at a <strong>typical HTML file</strong>:</p>
+ <pre class="prettyprint linenums">
+ &lt;html&gt;
+ &lt;head&gt;
+ &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
+ &lt;/head&gt;
+ &lt;body&gt;
+ &lt;h1&gt;Hello, world!&lt;/h1&gt;
+ &lt;/body&gt;
+ &lt;/html&gt;
+ </pre>
+ <p>To make this <strong>a Bootstrapped template</strong>, just include the appropriate CSS and JS files:</p>
+ <pre class="prettyprint linenums">
+ &lt;html&gt;
+ &lt;head&gt;
+ &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
+ &lt;!-- Bootstrap --&gt;
+ &lt;link href="css/bootstrap.min.css" rel="stylesheet"&gt;
+ &lt;script src="js/bootstrap.min.js"&gt;&lt;/script&gt;
+ &lt;/head&gt;
+ &lt;body&gt;
+ &lt;h1&gt;Hello, world!&lt;/h1&gt;
+ &lt;/body&gt;
+ &lt;/html&gt;
+ </pre>
+ <p><strong>And you're set!</strong> With those two files added, you can begin to develop any site or application with Bootstrap.</p>
+
+ <hr>
+
+ <h2>What next?</h2>
+ <p class="lead">Head to the docs for information, examples, and code snippets, or take the next leap and customize Bootstrap for any upcoming project.</p>
+ <a class="btn btn-large" href="./scaffolding.html">Visit the Bootstrap docs</a>
+ <a class="btn btn-large" href="./download.html" style="margin-left: 5px;">Customize Bootstrap</a>
+ </section>
+
+
+
+ </div>
</div>
+
</div>
+
<!-- Footer
================================================== -->
<footer class="footer">
diff --git a/docs/index.html b/docs/index.html
index d059aaa3e..4acc040ab 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -46,6 +46,9 @@
<a href="./index.html">Home</a>
</li>
<li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
@@ -72,7 +75,6 @@
<p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
<p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" >Download Bootstrap</a></p>
<ul class="masthead-links">
- <li><a href="./getting-started.html" >Getting started</a></li>
<li><a href="./download.html" >Customize</a></li>
<li><a href="http://github.com/twitter/bootstrap" >GitHub project</a></li>
<li>Version 2.1.0</li>
diff --git a/docs/javascript.html b/docs/javascript.html
index 21d0044b0..42c8a6f7e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -46,6 +46,9 @@
<a href="./index.html">Home</a>
</li>
<li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index ca94d8a54..dcdbadda4 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -45,6 +45,9 @@
<li class="">
<a href="./index.html">Home</a>
</li>
+ <li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
<li class="active">
<a href="./scaffolding.html">Scaffolding</a>
</li>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index cbfae7f26..6ba72e841 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -57,6 +57,9 @@
<li class="{{index}}">
<a href="./index.html">{{_i}}Home{{/i}}</a>
</li>
+ <li class="{{getting-started}}">
+ <a href="./getting-started.html">{{_i}}Get started{{/i}}</a>
+ </li>
<li class="{{scaffolding}}">
<a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
</li>
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index c6a03ec0a..46dccbd58 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -1,147 +1,170 @@
-</div>
-<!-- Masthead
+<!-- Subhead
================================================== -->
<header class="jumbotron subhead" id="overview">
<div class="container">
- <h1>{{_i}}Getting started{{/i}}</h1>
- <p class="lead">{{_i}}Overview of the project, it's contents, and how to get started with a simple template.{{/i}}</p>
-</div>
+ <h1>{{_i}}Getting started{{/i}}</h1>
+ <p class="lead">{{_i}}Overview of the project, it's contents, and how to get started with a simple template.{{/i}}</p>
+ </div>
</header>
<div class="container">
-<div class="row">
- <div class="span3 bs-docs-sidebar">
- <ul class="nav nav-list bs-docs-sidenav">
- <li><a href="#prerequisites">{{_i}}Prerequisites{{/i}} <i class="icon-chevron-right"></i></a></li>
- <li><a href="#file-structure">{{_i}}File structure{{/i}} <i class="icon-chevron-right"></i></a></li>
- <li><a href="#contents">{{_i}}What's included{{/i}} <i class="icon-chevron-right"></i></a></li>
- <li><a href="#html-template">{{_i}}HTML template{{/i}} <i class="icon-chevron-right"></i></a></li>
- </ul>
- </div>
- <div class="span9">
-
-
- <section id="prerequisites">
- <div class="page-header">
- <h1>{{_i}}Prerequisites{{/i}}</h1>
- </div>
- <p>{{_i}}Before getting started, you need the following:{{/i}}</p>
- <ul>
- <li>{{_i}}An unzipped copy of the <a href="https://github.com/twitter/bootstrap/zipball/master">latest version of Bootstrap</a> (which includes all CSS, JavaScript, and images).{{/i}}</li>
- <li>{{_i}}An editor of your choice for writing code (I recommend <a href="http://sublimetext.com/2">Sublime Text 2</a>).{{/i}}</li>
- <li>{{_i}}Some working knowledge of HTML and CSS.{{/i}}</li>
- </ul>
- <p>{{_i}}When ready, proceed to the next section, <a href="#file-structure">File structure</a>.{{/i}}</p>
- </section>
-
-
-
- <section id="file-structure">
- <div class="page-header">
- <h1>{{_i}}File structure{{/i}}</h1>
- </div>
- <p>{{_i}}Once unzipped, the structure of Bootstrap&rsquo;s files looks like this:{{/i}}</p>
- <ul>
- <li>bootstrap/
- <ul>
- <li>css/
- <ul>
- <li>bootstrap.css</li>
- <li>bootstrap.min.css</li>
- </ul>
- </li>
- <li>js/
- <ul>
- <li>bootstrap.js</li>
- <li>bootstrap.min.js</li>
- </ul>
- </li>
- <li>img/
- <ul>
- <li>glyphicons-halflings.png</li>
- <li>glyphicons-halflings-white.png</li>
- </ul>
- </li>
- <li>README.md</li>
- </ul>
- </li>
+
+
+ <div class="row">
+ <div class="span3 bs-docs-sidebar">
+ <ul class="nav nav-list bs-docs-sidenav">
+ <li><a href="#download-bootstrap">{{_i}}Download{{/i}} <i class="icon-chevron-right"></i></a></li>
+ <li><a href="#file-structure">{{_i}}File structure{{/i}} <i class="icon-chevron-right"></i></a></li>
+ <li><a href="#contents">{{_i}}What's included{{/i}} <i class="icon-chevron-right"></i></a></li>
+ <li><a href="#html-template">{{_i}}HTML template{{/i}} <i class="icon-chevron-right"></i></a></li>
</ul>
- <p>{{_i}}This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). The image files are compressed using <a href="http://imageoptim.com/">ImageOptim</a>, a Mac app for compressing PNGs.{{/i}}</p>
- </section>
+ </div>
+ <div class="span9">
- <section id="contents">
- <div class="page-header">
- <h1>{{_i}}What's included{{/i}}</h1>
- </div>
- <p>{{_i}}Bootstrap comes equipped with CSS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>:{{/i}}</p>
- <ul>
- <li><strong><a href="http://twitter.github.com/bootstrap/scaffolding.html">Scaffolding:</a></strong> Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.</li>
- <li><strong><a href="http://twitter.github.com/bootstrap/base-css.html">Base CSS:</a></strong> Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes <a href="http://glyphicons.com">Glyphicons</a>, a great little icon set.</li>
- <li><strong><a href="http://twitter.github.com/bootstrap/components.html">Components:</a></strong> Basic styles for common interface components like tabs and pills, navbar, page headers, and more.</li>
- <li><strong><a href="http://twitter.github.com/bootstrap/javascript.html">Javascript plugins:</a></strong> Similar to the Components section, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.</li>
- </ul>
- <p>Together, the <strong>Components</strong> and <strong>Javascript plugins</strong> sections provide the following interface elements:</p>
- <ul>
- <li>Button groups</li>
- <li>Button dropdowns</li>
- <li>Navigational tabs, pills, and lists</li>
- <li>Navbar</li>
- <li>Labels</li>
- <li>Badges</li>
- <li>Page headers and hero unit</li>
- <li>Thumbnails</li>
- <li>Alerts</li>
- <li>Progress bars</li>
- <li>Modals</li>
- <li>Dropdowns</li>
- <li>Tooltips</li>
- <li>Popovers</li>
- <li>Accordion</li>
- <li>Carousel</li>
- <li>Typeahead</li>
- </ul>
- <p>{{_i}}In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.{{/i}}</p>
- </section>
-
-
-
- <section id="html-template">
- <div class="page-header">
- <h1>{{_i}}Basic HTML template{{/i}}</h1>
- </div>
- <p>{{_i}}Now that we&rsquo;ve got the basic information on Bootstrap out of the way, we can focus on getting started. To do that, we&rsquo;ll utilize a basic HTML template that includes everything we&rsquo;ve mentioned in the <a href="#file-structure">File structure</a>.{{/i}}</p>
- <p>{{_i}}As previously mentioned, we won&rsquo;t cover the basics of writing HTML and CSS here. Instead, we&rsquo;ll leapfrog through various points in web development complexity to give you the broadest and most complete overview.{{/i}}</p>
- <p>{{_i}}Now, here&rsquo;s a look at a <strong>typical HTML file</strong>:{{/i}}</p>
- <pre class="prettyprint linenums">
- &lt;html&gt;
- &lt;head&gt;
- &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
- &lt;/head&gt;
- &lt;body&gt;
- &lt;h1&gt;Hello, world!&lt;/h1&gt;
- &lt;/body&gt;
- &lt;/html&gt;
- </pre>
- <p>{{_i}}To make this <strong>a Bootstrapped template</strong>, just include the appropriate CSS and JS files:{{/i}}</p>
- <pre class="prettyprint linenums">
- &lt;html&gt;
- &lt;head&gt;
- &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
- &lt;!-- Bootstrap --&gt;
- &lt;link href="css/bootstrap.min.css" rel="stylesheet"&gt;
- &lt;script src="js/bootstrap.min.js"&gt;&lt;/script&gt;
- &lt;/head&gt;
- &lt;body&gt;
- &lt;h1&gt;Hello, world!&lt;/h1&gt;
- &lt;/body&gt;
- &lt;/html&gt;
- </pre>
- <p>{{_i}}And you&rsquo;re set. With those two files added, you can begin to write Bootstrap-friendly HTML, CSS, and JS to build any site or application you like. Head to the Bootstrap docs for information, examples, and even code snippets for the Bootstrap grid system, base HTML styles, components, and even responsive features.{{/i}}</p>
- </section>
+ <!-- Download
+ ================================================== -->
+ <section id="download-bootstrap">
+ <div class="page-header">
+ <h1>{{_i}}1. Download{{/i}}</h1>
+ </div>
+ <p class="lead">{{_i}}Before downloading, be sure to have a code editor (we recommend <a href="http://sublimetext.com/2">Sublime Text 2</a>) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with our the compiled Bootstrap files.{{/i}}</p>
+ <div class="row">
+ <div class="span4">
+ <h3>Download compiled</h3>
+ <p><strong>Fastest way to get started:</strong> get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.</p>
+ <a class="btn btn-large btn-primary">Download Bootstrap</a>
+ </div>
+ <div class="span4">
+ <h3>Download source</h3>
+ <p>Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
+ <a class="btn btn-large">Download Bootstrap source</a>
+ </div>
+ </div>
+ </section>
- </div>
-</div> \ No newline at end of file
+
+ <!-- File structure
+ ================================================== -->
+ <section id="file-structure">
+ <div class="page-header">
+ <h1>{{_i}}2. File structure{{/i}}</h1>
+ </div>
+ <p>{{_i}}Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:{{/i}}</p>
+<pre class="prettyprint">
+ bootstrap/
+ ├── css/
+ │ ├── bootstrap.css
+ │ ├── bootstrap.min.css
+ ├── js/
+ │ ├── bootstrap.js
+ │ ├── bootstrap.min.js
+ ├── img/
+ │ ├── glyphicons-halflings.png
+ │ ├── glyphicons-halflings-white.png
+ └── README.md
+</pre>
+ <p>{{_i}}This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). The image files are compressed using <a href="http://imageoptim.com/">ImageOptim</a>, a Mac app for compressing PNGs.{{/i}}</p>
+ </section>
+
+
+
+ <!-- Contents
+ ================================================== -->
+ <section id="contents">
+ <div class="page-header">
+ <h1>{{_i}}3. What's included{{/i}}</h1>
+ </div>
+ <p>{{_i}}Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the <a href="http://getbootstrap.com">Bootstrap documentation</a>.{{/i}}</p>
+
+ <h4><a href="http://twitter.github.com/bootstrap/scaffolding.html">Scaffolding</a></h4>
+ <p>Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.</p>
+
+ <h4><a href="http://twitter.github.com/bootstrap/base-css.html">Base CSS</a></h4>
+ <p>Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes <a href="http://glyphicons.com">Glyphicons</a>, a great little icon set.</p>
+
+ <h4><a href="http://twitter.github.com/bootstrap/components.html">Components</a></h4>
+ <p>Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.</p>
+
+ <h4><a href="http://twitter.github.com/bootstrap/javascript.html">Javascript plugins</a></h4>
+ <p>Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.</p>
+
+ <hr>
+
+ <h3>List of components</h3>
+ <p>Together, the <strong>Components</strong> and <strong>Javascript plugins</strong> sections provide the following interface elements:</p>
+ <ul>
+ <li>Button groups</li>
+ <li>Button dropdowns</li>
+ <li>Navigational tabs, pills, and lists</li>
+ <li>Navbar</li>
+ <li>Labels</li>
+ <li>Badges</li>
+ <li>Page headers and hero unit</li>
+ <li>Thumbnails</li>
+ <li>Alerts</li>
+ <li>Progress bars</li>
+ <li>Modals</li>
+ <li>Dropdowns</li>
+ <li>Tooltips</li>
+ <li>Popovers</li>
+ <li>Accordion</li>
+ <li>Carousel</li>
+ <li>Typeahead</li>
+ </ul>
+ <p>{{_i}}In future guides, we may walk through these components individually in more detail. Until then, look for each of these in the documentation for information on how to utilize and customize them.{{/i}}</p>
+ </section>
+
+
+
+ <!-- HTML template
+ ================================================== -->
+ <section id="html-template">
+ <div class="page-header">
+ <h1>{{_i}}4. Basic HTML template{{/i}}</h1>
+ </div>
+ <p>{{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.{{/i}}</p>
+ <p>{{_i}}Now, here's a look at a <strong>typical HTML file</strong>:{{/i}}</p>
+ <pre class="prettyprint linenums">
+ &lt;html&gt;
+ &lt;head&gt;
+ &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
+ &lt;/head&gt;
+ &lt;body&gt;
+ &lt;h1&gt;Hello, world!&lt;/h1&gt;
+ &lt;/body&gt;
+ &lt;/html&gt;
+ </pre>
+ <p>{{_i}}To make this <strong>a Bootstrapped template</strong>, just include the appropriate CSS and JS files:{{/i}}</p>
+ <pre class="prettyprint linenums">
+ &lt;html&gt;
+ &lt;head&gt;
+ &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
+ &lt;!-- Bootstrap --&gt;
+ &lt;link href="css/bootstrap.min.css" rel="stylesheet"&gt;
+ &lt;script src="js/bootstrap.min.js"&gt;&lt;/script&gt;
+ &lt;/head&gt;
+ &lt;body&gt;
+ &lt;h1&gt;Hello, world!&lt;/h1&gt;
+ &lt;/body&gt;
+ &lt;/html&gt;
+ </pre>
+ <p>{{_i}}<strong>And you're set!</strong> With those two files added, you can begin to develop any site or application with Bootstrap.{{/i}}</p>
+
+ <hr>
+
+ <h2>What next?</h2>
+ <p class="lead">Head to the docs for information, examples, and code snippets, or take the next leap and customize Bootstrap for any upcoming project.</p>
+ <a class="btn btn-large" href="./scaffolding.html">Visit the Bootstrap docs</a>
+ <a class="btn btn-large" href="./download.html" style="margin-left: 5px;">Customize Bootstrap</a>
+ </section>
+
+
+
+ </div>{{! /span9 }}
+ </div>{{! row}}
+
+</div>{{! /container }}
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 024307959..6919f8e21 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -4,7 +4,6 @@
<p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
<p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.0']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a></p>
<ul class="masthead-links">
- <li><a href="./getting-started.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Getting started']);"{{/production}}>Getting started</a></li>
<li><a href="./download.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Customize']);"{{/production}}>Customize</a></li>
<li><a href="http://github.com/twitter/bootstrap" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);"{{/production}}>GitHub project</a></li>
<li>Version 2.1.0</li>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index d2b4b21c1..d2ac6ee16 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -46,6 +46,9 @@
<a href="./index.html">Home</a>
</li>
<li class="">
+ <a href="./getting-started.html">Get started</a>
+ </li>
+ <li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">