Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

This commit is contained in:
Mark Otto 2011-11-12 01:23:37 -08:00
commit cabf993bc6
6 changed files with 8 additions and 3 deletions

View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Bootstrap, from Twitter</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">

View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Bootstrap, from Twitter</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">

View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Bootstrap, from Twitter</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">

View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Bootstrap, from Twitter</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
@ -82,8 +83,7 @@
<div class="row">
<div class="span3">
<h2>Getting started</h2>
<p>Integrating javascript with the Bootstrap library is super easy. Below we go over the basics and provide you with some awesome plugins to get you started!</p>
<p><a class="btn primary" href="./javascript.html">View javascript docs &raquo;</a></p>
<p>Integrating javascript with the Bootstrap library is super easy. Here we go over the basics and provide you with some awesome plugins to get you started!</p>
</div>
<div class="span9">
<h3>What's included</h3>

View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Bootstrap, from Twitter</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">

View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Bootstrap, from Twitter</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
@ -242,7 +243,7 @@
</div>
<pre class="prettyprint linenums">
&lt;body&gt;
&lt;div class="container-fluid"&gt;
&lt;div class="fluid-container"&gt;
&lt;div class="sidebar"&gt;
...
&lt;/div&gt;