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

Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html

1 files changed, 10 insertions, 2 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 8432f92ea..b3c464941 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -315,7 +315,12 @@ h2 + table {
 
 /* Example sites showcase */
 .example-sites img {
-  width: 290px;
+  max-width: 290px;
+}
+.built-with {
+  margin: -18px 0 27px;
+  color: #999;
+  text-align: center;
 }
 
 .scrollspy-example {
@@ -382,12 +387,15 @@ h2 + table {
   .example-sites {
     margin-left: 0;
   }
-  .example-sites a {
+  .example-sites > li {
     float: none;
     display: block;
     max-width: 300px;
     margin: 0 auto 18px;
   }
+  .example-sites img {
+    max-width: 270px;
+  }
 
   table code {
     white-space: normal;