From beb0b640967e69e50d1f813a99e8998e27787fdb Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 31 Aug 2012 14:02:18 -0700
Subject: fixes #4889: btn-link disabled styles

---
 docs/assets/css/bootstrap.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b863b1266..0cced14a5 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3389,7 +3389,8 @@ input[type="submit"].btn.btn-mini {
 }
 
 .btn-link,
-.btn-link:active {
+.btn-link:active,
+.btn-link[disabled] {
   background-color: transparent;
   background-image: none;
   -webkit-box-shadow: none;
@@ -3412,6 +3413,11 @@ input[type="submit"].btn.btn-mini {
   background-color: transparent;
 }
 
+.btn-link[disabled]:hover {
+  color: #333333;
+  text-decoration: none;
+}
+
 .btn-group {
   position: relative;
   *margin-left: .3em;
-- 
cgit v1.2.3


From 0f85e8b7f820a83559870ce0c00d5ea884475fdc Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 31 Aug 2012 22:37:46 -0700
Subject: fixes #4824: scope table grid sizes to .table instead of table

---
 docs/assets/css/bootstrap.css | 48 +++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 0cced14a5..c8ea594dc 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1947,145 +1947,145 @@ table [class*=span],
   margin-left: 0;
 }
 
-table .span1 {
+.table .span1 {
   float: none;
   width: 44px;
   margin-left: 0;
 }
 
-table .span2 {
+.table .span2 {
   float: none;
   width: 124px;
   margin-left: 0;
 }
 
-table .span3 {
+.table .span3 {
   float: none;
   width: 204px;
   margin-left: 0;
 }
 
-table .span4 {
+.table .span4 {
   float: none;
   width: 284px;
   margin-left: 0;
 }
 
-table .span5 {
+.table .span5 {
   float: none;
   width: 364px;
   margin-left: 0;
 }
 
-table .span6 {
+.table .span6 {
   float: none;
   width: 444px;
   margin-left: 0;
 }
 
-table .span7 {
+.table .span7 {
   float: none;
   width: 524px;
   margin-left: 0;
 }
 
-table .span8 {
+.table .span8 {
   float: none;
   width: 604px;
   margin-left: 0;
 }
 
-table .span9 {
+.table .span9 {
   float: none;
   width: 684px;
   margin-left: 0;
 }
 
-table .span10 {
+.table .span10 {
   float: none;
   width: 764px;
   margin-left: 0;
 }
 
-table .span11 {
+.table .span11 {
   float: none;
   width: 844px;
   margin-left: 0;
 }
 
-table .span12 {
+.table .span12 {
   float: none;
   width: 924px;
   margin-left: 0;
 }
 
-table .span13 {
+.table .span13 {
   float: none;
   width: 1004px;
   margin-left: 0;
 }
 
-table .span14 {
+.table .span14 {
   float: none;
   width: 1084px;
   margin-left: 0;
 }
 
-table .span15 {
+.table .span15 {
   float: none;
   width: 1164px;
   margin-left: 0;
 }
 
-table .span16 {
+.table .span16 {
   float: none;
   width: 1244px;
   margin-left: 0;
 }
 
-table .span17 {
+.table .span17 {
   float: none;
   width: 1324px;
   margin-left: 0;
 }
 
-table .span18 {
+.table .span18 {
   float: none;
   width: 1404px;
   margin-left: 0;
 }
 
-table .span19 {
+.table .span19 {
   float: none;
   width: 1484px;
   margin-left: 0;
 }
 
-table .span20 {
+.table .span20 {
   float: none;
   width: 1564px;
   margin-left: 0;
 }
 
-table .span21 {
+.table .span21 {
   float: none;
   width: 1644px;
   margin-left: 0;
 }
 
-table .span22 {
+.table .span22 {
   float: none;
   width: 1724px;
   margin-left: 0;
 }
 
-table .span23 {
+.table .span23 {
   float: none;
   width: 1804px;
   margin-left: 0;
 }
 
-table .span24 {
+.table .span24 {
   float: none;
   width: 1884px;
   margin-left: 0;
-- 
cgit v1.2.3


From 02f6bd65f5cd44b41e49d23ed7e6a068a04805a6 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 1 Sep 2012 12:00:13 -0700
Subject: fixes #4910: use @baseLineHeight * 1.5 for .lead font-size

---
 docs/assets/css/bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c8ea594dc..c0e1988ac 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -584,7 +584,7 @@ p {
 
 .lead {
   margin-bottom: 20px;
-  font-size: 20px;
+  font-size: 30px;
   font-weight: 200;
   line-height: 30px;
 }
-- 
cgit v1.2.3


From 37379048599c1ce93aa2f36df46afbc09cb6d19b Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 2 Sep 2012 13:25:03 -0700
Subject: fixes #4922: use basefontsize for realz on .lead

---
 docs/assets/css/bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c0e1988ac..d64ff51ab 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -584,7 +584,7 @@ p {
 
 .lead {
   margin-bottom: 20px;
-  font-size: 30px;
+  font-size: 21px;
   font-weight: 200;
   line-height: 30px;
 }
-- 
cgit v1.2.3


From 9d5f9eca85b9d413b4389b744bbf57c20c447c2b Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 3 Sep 2012 00:47:48 -0700
Subject: fixes #4909: add color utility classes .text-warning, etc and
 document them

---
 docs/assets/css/bootstrap.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d64ff51ab..ccafb83bb 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -609,6 +609,22 @@ cite {
   color: #999999;
 }
 
+.text-warning {
+  color: #c09853;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+.text-success {
+  color: #468847;
+}
+
 h1,
 h2,
 h3,
-- 
cgit v1.2.3


From 8cda830eaf568be8204a96ca635c0bed373028ff Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 3 Sep 2012 01:13:42 -0700
Subject: fixes #4146: IE7-8 responsive image helper

---
 docs/assets/css/bootstrap.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ccafb83bb..32cc021ea 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -67,6 +67,7 @@ sub {
 }
 
 img {
+  width: auto\9;
   height: auto;
   max-width: 100%;
   vertical-align: middle;
-- 
cgit v1.2.3


From de36456f5d3498320fae6e2ad106a9a7f38910cc Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 4 Sep 2012 11:00:25 -0700
Subject: fixes #4957: use input border var for select element instead of #ddd

---
 docs/assets/css/bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 32cc021ea..9fa6f766f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1073,7 +1073,7 @@ input[type="file"] {
 select {
   width: 220px;
   background-color: #ffffff;
-  border: 1px solid #bbb;
+  border: 1px solid #cccccc;
 }
 
 select[multiple],
-- 
cgit v1.2.3


From 08b8571cb842e9fc668d9faf6c305a51523b27fb Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 5 Sep 2012 10:00:57 -0700
Subject: version bump to get this started

---
 docs/assets/css/bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9fa6f766f..cad0b44e7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.1.1
+ * Bootstrap v2.1.2
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
-- 
cgit v1.2.3


From dfb3175d4b7904a4fe3f1d3ec41145c5021484dc Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 5 Sep 2012 10:04:28 -0700
Subject: rebuild after merge

---
 docs/assets/css/bootstrap.css | 2 --
 1 file changed, 2 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9fa6f766f..7f6bf7b43 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2157,8 +2157,6 @@ table [class*=span],
 /* White icons with optional class, or on hover/active states of certain elements */
 
 .icon-white,
-.nav-tabs > .active > a > [class^="icon-"],
-.nav-tabs > .active > a > [class*=" icon-"],
 .nav-pills > .active > a > [class^="icon-"],
 .nav-pills > .active > a > [class*=" icon-"],
 .nav-list > .active > a > [class^="icon-"],
-- 
cgit v1.2.3


From d4a16d35eb031cc4cffa4a3c4456fab406e286e5 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 5 Sep 2012 10:05:54 -0700
Subject: fixes #4996: incorrect border radius on a table

---
 docs/assets/css/bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 8dab9eb23..772c8e489 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1944,7 +1944,7 @@ table {
 .table-bordered colgroup + tbody tr:first-child td:last-child {
   -webkit-border-top-right-radius: 4px;
           border-top-right-radius: 4px;
-  -moz-border-radius-topleft: 4px;
+  -moz-border-radius-topright: 4px;
 }
 
 .table-striped tbody tr:nth-child(odd) td,
-- 
cgit v1.2.3


From 7a0f5c6c00ab7f70346e59503f850c5b5623f908 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 7 Sep 2012 11:04:51 -0700
Subject: fixes #5010: .pager span selector should be scoped to immediate
 children only

---
 docs/assets/css/bootstrap.css | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 772c8e489..cf70b5c35 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4824,8 +4824,8 @@ input[type="submit"].btn.btn-mini {
   display: inline;
 }
 
-.pager a,
-.pager span {
+.pager li > a,
+.pager li > span {
   display: inline-block;
   padding: 5px 14px;
   background-color: #fff;
@@ -4835,23 +4835,24 @@ input[type="submit"].btn.btn-mini {
           border-radius: 15px;
 }
 
-.pager a:hover {
+.pager li > a:hover {
   text-decoration: none;
   background-color: #f5f5f5;
 }
 
-.pager .next a,
-.pager .next span {
+.pager .next > a,
+.pager .next > span {
   float: right;
 }
 
-.pager .previous a {
+.pager .previous > a,
+.pager .previous > span {
   float: left;
 }
 
-.pager .disabled a,
-.pager .disabled a:hover,
-.pager .disabled span {
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > span {
   color: #999999;
   cursor: default;
   background-color: #fff;
-- 
cgit v1.2.3


From f2bd7d9f276753a8a2ab27490d06c2a081abb3af Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 7 Sep 2012 11:10:00 -0700
Subject: fixes #5018: .btn-block in .modal-footer no longer has left margin

---
 docs/assets/css/bootstrap.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cf70b5c35..231d5283b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4988,6 +4988,10 @@ input[type="submit"].btn.btn-mini {
   margin-left: -1px;
 }
 
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+
 .tooltip {
   position: absolute;
   z-index: 1030;
-- 
cgit v1.2.3


From 61332d727e6e1d67def803b2f8d61047d79db0cc Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 7 Sep 2012 11:34:05 -0700
Subject: fixes #5020: submenu support in dropup

---
 docs/assets/css/bootstrap.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 231d5283b..2e9734cf5 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2902,6 +2902,16 @@ table [class*=span],
   display: block;
 }
 
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  -webkit-border-radius: 5px 5px 5px 0;
+     -moz-border-radius: 5px 5px 5px 0;
+          border-radius: 5px 5px 5px 0;
+}
+
 .dropdown-submenu > a:after {
   display: block;
   float: right;
-- 
cgit v1.2.3