From 2b5b87db7de48703a38c3a87f8f3ae47ccffab42 Mon Sep 17 00:00:00 2001
From: Martin Bean <martin@mcbwebdesign.co.uk>
Date: Thu, 24 Nov 2011 11:37:08 +0000
Subject: [PATCH 1/7] Fixed a typo. Because I'm a Grammar Nazi.

---
 docs/javascript.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 055be36c88..39bf319ff9 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -76,7 +76,7 @@
     <div class="container">
 
     <!-- Modal
-    ================================================== -->
+    ================================================== -->
 
     <section id="modal">
       <div class="page-header">
@@ -385,7 +385,7 @@ $('#my-modal').bind('hidden', function () {
           <h3>Methods</h3>
           <h4>$().tabs or $().pills</h4>
           <p>
-            Activates tab and pill functionality for a given container. Tab links should reference id's in the document.
+            Activates tab and pill functionality for a given container. Tab links should reference IDs in the document.
           </p>
 <pre class="prettyprint linenums">
 &lt;ul class="tabs"&gt;

From fe68f708ce723cef640c1cf784cb29da513bca22 Mon Sep 17 00:00:00 2001
From: Martin Bean <martin@mcbwebdesign.co.uk>
Date: Thu, 24 Nov 2011 19:06:00 +0000
Subject: [PATCH 2/7] Removed funky characters.

---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 39bf319ff9..10d81a0c30 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -76,7 +76,7 @@
     <div class="container">
 
     <!-- Modal
-    ================================================== -->
+    ================================================== -->
 
     <section id="modal">
       <div class="page-header">

From 40604548ce91ffd2ccfcca782f4db5fc79d70417 Mon Sep 17 00:00:00 2001
From: Chris Gunther <chris@room118solutions.com>
Date: Wed, 7 Dec 2011 20:16:19 -0500
Subject: [PATCH 3/7] remove text-shadow from labels

---
 bootstrap.css     | 3 ++-
 bootstrap.min.css | 2 +-
 lib/patterns.less | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index e5aa166089..1d6119ca54 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Nov 20 21:42:29 PST 2011
+ * Date: Wed Dec  7 20:14:59 EST 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -2415,6 +2415,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+  text-shadow: none;
 }
 .label.important {
   background-color: #c43c35;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 39b2661d11..2e2996d80d 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -345,7 +345,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
 .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
 .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
-.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;white-space:nowrap;background-color:#bfbfbf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;}
+.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;white-space:nowrap;background-color:#bfbfbf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;text-shadow:none;}.label.important{background-color:#c43c35;}
 .label.warning{background-color:#f89406;}
 .label.success{background-color:#46a546;}
 .label.notice{background-color:#62cffc;}
diff --git a/lib/patterns.less b/lib/patterns.less
index 5b72081b2d..b16748c698 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -1025,6 +1025,7 @@ input[type=submit].btn {
   white-space: nowrap;
   background-color: @grayLight;
   .border-radius(3px);
+  text-shadow: none;
   &.important { background-color: #c43c35; }
   &.warning   { background-color: @orange; }
   &.success   { background-color: @green; }

From 5f54e4aad15b406128356f5ddd9ac7aad583f928 Mon Sep 17 00:00:00 2001
From: Troy Murray <tm@msu.edu>
Date: Fri, 9 Dec 2011 11:34:58 -0500
Subject: [PATCH 4/7] Add code block for condensed table example

---
 docs/index.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/index.html b/docs/index.html
index 6e3475ec7c..0206563e44 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -897,7 +897,10 @@
           </tr>
         </tbody>
       </table>
-
+<pre class="prettyprint linenums">
+&lt;table class="condensed-table"&gt;
+  ...
+&lt;/table&gt;</pre>
       <h3>Example: Bordered table</h3>
       <p>Make your tables look just a wee bit sleeker by rounding their corners and adding borders on all sides.</p>
       <table class="bordered-table">

From e28b080c7989e9725beb1218dc45267fdd3b9bca Mon Sep 17 00:00:00 2001
From: Alexander Pirsig <apirsig@web.de>
Date: Wed, 14 Dec 2011 16:48:50 +0100
Subject: [PATCH 5/7] changed npm package name to less

---
 docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.html b/docs/index.html
index 0206563e44..2468e97f53 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1974,7 +1974,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
           <td>Node with makefile</td>
           <td>
             <p>Install the less command line compiler with npm by running the following command:</p>
-            <pre>$ npm install lessc</pre>
+            <pre>$ npm install less</pre>
             <p>Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.</p>
             <p>Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).</p>
           </td>

From 791fd6a141db8905f66b379912be60d764bf0636 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sun, 25 Dec 2011 20:17:35 -0800
Subject: [PATCH 6/7] Make modal windows scrollable

Closes #849.
---
 lib/patterns.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/patterns.less b/lib/patterns.less
index b16748c698..b70ae1cb24 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -834,6 +834,8 @@ input[type=submit].btn {
   top: 50%;
   left: 50%;
   z-index: 11000;
+  max-height: 500px;
+  overflow: auto;
   width: 560px;
   margin: -250px 0 0 -280px;
   background-color: @white;

From 7fbb3660ef0b1fd759355fc3d65994f0c14b4a2f Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sun, 25 Dec 2011 20:18:49 -0800
Subject: [PATCH 7/7] Rebuild CSS

---
 bootstrap.css     | 4 +++-
 bootstrap.min.css | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 1d6119ca54..b2263018e3 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Dec  7 20:14:59 EST 2011
+ * Date: Sun Dec 25 20:18:31 PST 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -2177,6 +2177,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   top: 50%;
   left: 50%;
   z-index: 11000;
+  max-height: 500px;
+  overflow: auto;
   width: 560px;
   margin: -250px 0 0 -280px;
   background-color: #ffffff;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 2e2996d80d..617c87f232 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -319,7 +319,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
 .modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;}
 .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}
-.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;}
+.modal{position:fixed;top:50%;left:50%;z-index:11000;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;}
 .modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
 .modal.fade.in{top:50%;}
 .modal-header{border-bottom:1px solid #eee;padding:5px 15px;}