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

cabf993b · Mark Otto · 1fb98bed · a4d6e7e9 · cabf993b · cabf993b
Commit cabf993b authored Nov 12, 2011 by Mark Otto
6 changed files
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -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="">

--- a/docs/components.html
+++ b/docs/components.html
@@ -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="">

--- a/docs/index.html
+++ b/docs/index.html
@@ -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="">

--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -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>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>
-       <p><a class="btn primary" href="./javascript.html">View javascript docs &raquo;</a></p>
     </div>
     <div class="span9">
      <h3>What's included</h3>

--- a/docs/less.html
+++ b/docs/less.html
@@ -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="">

--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -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;