aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-08 13:39:50 -0800
committerJacob Thornton <[email protected]>2012-01-08 13:39:50 -0800
commit93a8b331bb1e263095c4aa3fae61dea834adad86 (patch)
tree8bf312546dafe2c5fa5fe8a86d6b2f6392b4f368 /docs
parentf83240a8f93349c93582a96c4f4a7541388d6a80 (diff)
parent6226b14e3b97819119da0f026e9d3ae6dd0a31c0 (diff)
downloadbootstrap-93a8b331bb1e263095c4aa3fae61dea834adad86.tar.xz
bootstrap-93a8b331bb1e263095c4aa3fae61dea834adad86.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/docs.css2
-rw-r--r--docs/components.html2
-rw-r--r--docs/index.html5
3 files changed, 5 insertions, 4 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index c359cf73b..f37067203 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -163,7 +163,7 @@ body > .navbar-fixed .brand:hover {
/* Marketing section of Overview
-------------------------------------------------- */
.marketing .row {
- margin-bottom: 18px;
+ margin-bottom: 9px;
}
.marketing h1 {
margin: 36px 0 27px;
diff --git a/docs/components.html b/docs/components.html
index 2a9d15846..0c70ef168 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -506,7 +506,7 @@
<pre class="prettyprint linenums">
&lt;div class="navbar navbar-static"&gt;
&lt;div class="navbar-inner"&gt;
- &lt;div class="container" style="width: auto;"&gt;
+ &lt;div class="container"&gt;
...
&lt;/div&gt;
&lt;/div&gt;
diff --git a/docs/index.html b/docs/index.html
index 231ed2066..8f7963afd 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -127,6 +127,7 @@
</ul>
<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">
<img class="icon" src="assets/img/glyphicons/glyphicons_042_group.png">
@@ -153,7 +154,7 @@
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
<h2>Responsive design</h2>
- <p>With Bootstrap 2, we've gone fully responsive. Our components are flexible enough to scale according to whatever resolution or device you're using to provide a consistent experience, no matter what.</p>
+ <p>With Bootstrap 2, we've gone fully responsive. Our components are scale according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
</div>
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
@@ -205,7 +206,7 @@
<!-- Quickstart options
================================================== -->
<h1>Get started in no time.</h1>
- <p class="marketing-byline">Built for any skill level, Bootstrap fits your workflow and development process.</p>
+ <p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
<table class="bordered-table getting-started">
<tbody>
<tr>