aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-19 13:21:35 -0700
committerMark Otto <[email protected]>2012-06-19 13:21:35 -0700
commit9aa5a6db12fcbc1638610132c1a0f64633325f44 (patch)
tree576115bc37a4067fcdb9be533e6aeb48dfa476f9
parentbae3cfd18343ce4909b26f03ee0008f0de1d2d46 (diff)
downloadbootstrap-9aa5a6db12fcbc1638610132c1a0f64633325f44.tar.xz
bootstrap-9aa5a6db12fcbc1638610132c1a0f64633325f44.zip
updated tests and homepage marketing copy
-rw-r--r--docs/index.html8
-rw-r--r--docs/templates/pages/index.mustache8
-rw-r--r--less/tests/css-tests.html21
3 files changed, 24 insertions, 13 deletions
diff --git a/docs/index.html b/docs/index.html
index 63f58bf3f..34bb0fe16 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -133,12 +133,12 @@
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
<h2>Responsive design</h2>
- <p>As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
+ <p>Beginning with Bootstrap 2, components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
</div>
<div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
- <h2>Styleguide docs</h2>
- <p>Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.</p>
+ <h2>Living, coded examples</h2>
+ <p>Bootstrap was designed first and foremost as a way to document not only the code of our components, but the visual and interaction design through live examples.</p>
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
<h2>Growing library</h2>
@@ -146,7 +146,7 @@
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_009_magic.png">
<h2>Custom jQuery plugins</h2>
- <p>Easy-to-use, proper, and extensible interactions for many common components with custom-built jQuery plugins to bring your projects to life.</p>
+ <p>Easy-to-use, proper, and extensible interactions for many of our components with custom-built jQuery plugins to quickly bring any project to life.</p>
<img class="bs-icon" src="assets/img/less-small.png">
<h2>Built on LESS</h2>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index fe7a02717..d7c971372 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -56,12 +56,12 @@
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
<h2>{{_i}}Responsive design{{/i}}</h2>
- <p>{{_i}}As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}</p>
+ <p>{{_i}}Beginning with Bootstrap 2, components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}</p>
</div>
<div class="span5">
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
- <h2>{{_i}}Styleguide docs{{/i}}</h2>
- <p>{{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}</p>
+ <h2>{{_i}}Living, coded examples{{/i}}</h2>
+ <p>{{_i}}Bootstrap was designed first and foremost as a way to document not only the code of our components, but the visual and interaction design through live examples.{{/i}}</p>
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
<h2>{{_i}}Growing library{{/i}}</h2>
@@ -69,7 +69,7 @@
<img class="bs-icon" src="assets/img/glyphicons/glyphicons_009_magic.png">
<h2>{{_i}}Custom jQuery plugins{{/i}}</h2>
- <p>{{_i}}Easy-to-use, proper, and extensible interactions for many common components with custom-built jQuery plugins to bring your projects to life.{{/i}}</p>
+ <p>{{_i}}Easy-to-use, proper, and extensible interactions for many of our components with custom-built jQuery plugins to quickly bring any project to life.{{/i}}</p>
<img class="bs-icon" src="assets/img/less-small.png">
<h2>{{_i}}Built on LESS{{/i}}</h2>
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index b7177e5c6..017aa84f1 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -472,17 +472,21 @@
<form>
<div class="controls">
<div class="input-prepend">
- <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
+ <span class="add-on">@</span>
+ <input class="span2" id="prependedInput" size="16" type="text">
</div>
</div>
<div class="controls">
<div class="input-append">
- <input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
+ <input class="span2" id="prependedInput" size="16" type="text">
+ <span class="add-on">@</span>
</div>
</div>
<div class="controls">
<div class="input-prepend input-append">
- <span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
+ <span class="add-on">$</span>
+ <input class="span2" id="prependedInput" size="16" type="text">
+ <span class="add-on">.00</span>
</div>
</div>
</form>
@@ -491,10 +495,17 @@
<h4>Prepend and append with uneditable</h4>
<form>
<div class="input-prepend">
- <span class="add-on">$</span><span class="span2 uneditable-input">Some value here</span>
+ <span class="add-on">$</span>
+ <span class="span2 uneditable-input">Some value here</span>
</div>
<div class="input-append">
- <span class="span2 uneditable-input">Some value here</span><span class="add-on">.00</span>
+ <span class="span2 uneditable-input">Some value here</span>
+ <span class="add-on">.00</span>
+ </div>
+ <div class="input-prepend input-append">
+ <span class="add-on">$</span>
+ <span class="span2 uneditable-input">Some value here</span>
+ <span class="add-on">.00</span>
</div>
</form>
</div><!--/span-->