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

3 files changed, 19 insertions, 3 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ef8b138ad..fb727a900 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -22,6 +22,7 @@ section > .row {
 /* Jumbotrons
 -------------------------------------------------- */
 .jumbotron {
+  min-width: 940px;
   padding-top: 40px;
 }
 .jumbotron .inner {
@@ -98,6 +99,7 @@ section > .row {
 -------------------------------------------------- */
 .footer {
   background-color: #eee;
+  min-width: 940px;
   padding: 30px 0;
   text-shadow: 0 1px 0 #fff;
   border-top: 1px solid #e5e5e5;
@@ -183,7 +185,6 @@ section > .row {
 }
 .show-grid [class*="span"] {
   background: #eee;
-  background: rgba(0,0,0,.1);
   text-align: center;
   -webkit-border-radius: 3px;
      -moz-border-radius: 3px;
@@ -193,12 +194,14 @@ section > .row {
 }
 .show-grid:hover [class*="span"] {
   background: #ddd;
-  background: rgba(0,0,0,.2);
 }
 .show-grid .show-grid {
   margin-top: 0;
   margin-bottom: 0;
 }
+.show-grid .show-grid [class*="span"] {
+  background-color: #ccc;
+}
 
 
 /* Render mini layout previews
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 7400bc12b..16a20e068 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -20,6 +20,7 @@ $(document).ready(function(){
 
   // Disable certain links in docs
   // =============================
+  // Please do not carry these styles over to your projects, it's merely here to prevent button clicks form taking you away from your spot on page
 
   $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function (e) {
     e.preventDefault()
diff --git a/docs/index.html b/docs/index.html
index 2edd852ba..f99b756fe 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1006,6 +1006,18 @@
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix">
+            <label for="multiSelect">Multiple select</label>
+            <div class="input">
+              <select class="medium" multiple="multiple" name="multiSelect" id="multiSelect">
+                <option>1</option>
+                <option>2</option>
+                <option>3</option>
+                <option>4</option>
+                <option>5</option>
+              </select>
+            </div>
+          </div><!-- /clearfix -->
+          <div class="clearfix">
             <label>Uneditable input</label>
             <div class="input">
               <span class="uneditable-input">Some value here</span>
@@ -1911,7 +1923,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
         <p class="pull-right"><a href="#">Back to top</a></p>
         <p>
           Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.<br />
-          Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>.
+          Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.
         </p>
       </div>
     </footer>