diff options
| author | Mark Otto <[email protected]> | 2011-11-12 01:23:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-11-12 01:23:37 -0800 |
| commit | cabf993bc6f2f984474503f636b4c4ba6d62912e (patch) | |
| tree | c6c4cda6aa1b820891db5fdf5584d49d955af105 | |
| parent | 1fb98bed91977b710ae321443d0819939a1a8cc7 (diff) | |
| parent | a4d6e7e9a38517a7fbe8061008798fc8bac68a96 (diff) | |
| download | bootstrap-cabf993bc6f2f984474503f636b4c4ba6d62912e.tar.xz bootstrap-cabf993bc6f2f984474503f636b4c4ba6d62912e.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
| -rw-r--r-- | docs/base-css.html | 1 | ||||
| -rw-r--r-- | docs/components.html | 1 | ||||
| -rw-r--r-- | docs/index.html | 1 | ||||
| -rw-r--r-- | docs/javascript.html | 4 | ||||
| -rw-r--r-- | docs/less.html | 1 | ||||
| -rw-r--r-- | docs/scaffolding.html | 3 |
6 files changed, 8 insertions, 3 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index f6030ace1..51c4d35a3 100644 --- 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=""> diff --git a/docs/components.html b/docs/components.html index 73a049298..bb2f326b4 100644 --- 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=""> diff --git a/docs/index.html b/docs/index.html index a78c8bd87..051778741 100644 --- 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=""> diff --git a/docs/javascript.html b/docs/javascript.html index 3175d261e..a962e043c 100644 --- 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><a class="btn primary" href="./javascript.html">View javascript docs »</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> diff --git a/docs/less.html b/docs/less.html index 108ec35df..fccd5b9a4 100644 --- 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=""> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index de50caf8d..10ad71a74 100644 --- 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"> <body> - <div class="container-fluid"> + <div class="fluid-container"> <div class="sidebar"> ... </div> |