From 901da1b2b4727e3d00990dcf66ea3d31703b4edc Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 27 Aug 2013 17:13:07 -0700
Subject: use direct-child selector more in table styles to better support
 nested tables; fixes #10231

---
 dist/css/bootstrap.css | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 319ca9e3a..eef6079f3 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1402,33 +1402,33 @@ th {
   margin-bottom: 20px;
 }
 
-.table thead > tr > th,
-.table tbody > tr > th,
-.table tfoot > tr > th,
-.table thead > tr > td,
-.table tbody > tr > td,
-.table tfoot > tr > td {
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
   padding: 8px;
   line-height: 1.428571429;
   vertical-align: top;
   border-top: 1px solid #dddddd;
 }
 
-.table thead > tr > th {
+.table > thead > tr > th {
   vertical-align: bottom;
   border-bottom: 2px solid #dddddd;
 }
 
-.table caption + thead tr:first-child th,
-.table colgroup + thead tr:first-child th,
-.table thead:first-child tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child td {
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
   border-top: 0;
 }
 
-.table tbody + tbody {
+.table > tbody + tbody {
   border-top: 2px solid #dddddd;
 }
 
@@ -1436,12 +1436,12 @@ th {
   background-color: #ffffff;
 }
 
-.table-condensed thead > tr > th,
-.table-condensed tbody > tr > th,
-.table-condensed tfoot > tr > th,
-.table-condensed thead > tr > td,
-.table-condensed tbody > tr > td,
-.table-condensed tfoot > tr > td {
+.table-condensed > thead > tr > th,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > tbody > tr > td,
+.table-condensed > tfoot > tr > td {
   padding: 5px;
 }
 
-- 
cgit v1.2.3


From 794d7845199d46b89f45026d47091e6f30de73a2 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 1 Sep 2013 09:49:28 +0200
Subject: fixes #10153: restore headings-color variable

---
 dist/css/bootstrap.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 856e378cb..5318d432e 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -399,7 +399,8 @@ p {
   }
 }
 
-small {
+small,
+.small {
   font-size: 85%;
 }
 
@@ -458,6 +459,7 @@ h6,
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-weight: 500;
   line-height: 1.1;
+  color: inherit;
 }
 
 h1 small,
-- 
cgit v1.2.3


From 4b53ea52e9cc27ab27dde2695400fd6c95a0b6c2 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 1 Sep 2013 09:53:41 +0200
Subject: fixes #10223: adds color to input addon

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

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 5318d432e..10ba482b5 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3716,6 +3716,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   font-size: 14px;
   font-weight: normal;
   line-height: 1;
+  color: #555555;
   text-align: center;
   background-color: #eeeeee;
   border: 1px solid #cccccc;
-- 
cgit v1.2.3