From e38d08d4c0c23e678549b10f96286b37a7d8c7ed Mon Sep 17 00:00:00 2001
From: RJ Regenold <rjregenold@gmail.com>
Date: Thu, 31 Jan 2013 09:06:37 -0600
Subject: fixes jankiness with anchor tags in carousel.

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

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c0c5ac91e..6c568a918 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5917,7 +5917,9 @@ a.badge:hover {
           transition: 0.6s ease-in-out left;
 }
 
-.carousel-inner > .item > img {
+.carousel-inner > .item > img,
+.carousel-inner > .item > a,
+.carousel-inner > .item > img > a {
   display: block;
   line-height: 1;
 }
-- 
cgit v1.2.3


From 6014e630547d08dcc9610546e4f04aaac0c30be5 Mon Sep 17 00:00:00 2001
From: RJ Regenold <rjregenold@gmail.com>
Date: Thu, 31 Jan 2013 11:10:41 -0600
Subject: lets see how much i can mess this pull request up. :|

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

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6c568a918..bb05c79d5 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5919,7 +5919,7 @@ a.badge:hover {
 
 .carousel-inner > .item > img,
 .carousel-inner > .item > a,
-.carousel-inner > .item > img > a {
+.carousel-inner > .item > a > img {
   display: block;
   line-height: 1;
 }
-- 
cgit v1.2.3


From 2f44d8d2dac855ecaeb0ad4ac460c83bb2ca321b Mon Sep 17 00:00:00 2001
From: RJ Regenold <rjregenold@gmail.com>
Date: Thu, 31 Jan 2013 12:49:53 -0600
Subject: removes anchor tag definition.

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

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index bb05c79d5..e09e1e23a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5918,7 +5918,6 @@ a.badge:hover {
 }
 
 .carousel-inner > .item > img,
-.carousel-inner > .item > a,
 .carousel-inner > .item > a > img {
   display: block;
   line-height: 1;
-- 
cgit v1.2.3


From b7b2e4f8a1bda965442668869e1dc5e5118fd985 Mon Sep 17 00:00:00 2001
From: Nikhil Dabas <nikhil@nikhildabas.com>
Date: Sat, 2 Feb 2013 02:04:30 +0530
Subject: Fixing inline lists for IE7

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

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c0c5ac91e..ca9c699b6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -835,8 +835,10 @@ ol.inline {
 ul.inline > li,
 ol.inline > li {
   display: inline-block;
+  *display: inline;
   padding-right: 5px;
   padding-left: 5px;
+  *zoom: 1;
 }
 
 dl {
-- 
cgit v1.2.3


From db8a78fae6aed5ecced5f20df65cea352af32bb9 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 4 Feb 2013 11:11:04 -0800
Subject: Fixes #6794: incorrect docs mention of th element

---
 docs/base-css.html                     | 3 +--
 docs/templates/pages/base-css.mustache | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'docs')

diff --git a/docs/base-css.html b/docs/base-css.html
index abc5a3a6e..a9943ff96 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -857,8 +857,7 @@ For example, &lt;code&gt;&amp;lt;section&amp;gt;&lt;/code&gt; should be wrapped
                   <code>&lt;th&gt;</code>
                 </td>
                 <td>
-                  Special table cell for column (or row, depending on scope and placement) labels<br>
-                  Must be used within a <code>&lt;thead&gt;</code>
+                  Special table cell for column (or row, depending on scope and placement) labels
                 </td>
               </tr>
               <tr>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index a544d319d..9a051d4be 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -794,8 +794,7 @@
                   <code>&lt;th&gt;</code>
                 </td>
                 <td>
-                  {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}<br>
-                  {{_i}}Must be used within a <code>&lt;thead&gt;</code>{{/i}}
+                  {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}
                 </td>
               </tr>
               <tr>
-- 
cgit v1.2.3