From b8511568637dfa4decb3f0475436a3dfa637a57d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 11:26:45 -0800
Subject: change form fields back to inline-block to allow for inline-help text
 in default form markup

---
 bootstrap.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bootstrap.css')

diff --git a/bootstrap.css b/bootstrap.css
index 0166a3201..39add8696 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 Jan 25 11:21:22 PST 2012
+ * Date: Wed Jan 25 11:24:56 PST 2012
  */
 article,
 aside,
@@ -497,7 +497,7 @@ input,
 textarea,
 select,
 .uneditable-input {
-  display: block;
+  display: inline-block;
   width: 210px;
   height: 18px;
   padding: 4px;
-- 
cgit v1.2.3


From 58d08a2db3e2ed1b789a5290ced2f0327c9c163b Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 11:35:08 -0800
Subject: enable support for form states on select elements

---
 bootstrap.css | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'bootstrap.css')

diff --git a/bootstrap.css b/bootstrap.css
index 730167f51..4bffde24d 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 Jan 25 11:27:15 PST 2012
+ * Date: Wed Jan 25 11:31:57 PST 2012
  */
 article,
 aside,
@@ -715,11 +715,11 @@ textarea[readonly] {
 .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
   color: #c09853;
 }
-.control-group.warning input, .control-group.warning textarea {
+.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
   color: #c09853;
   border-color: #c09853;
 }
-.control-group.warning input:focus, .control-group.warning textarea:focus {
+.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
   border-color: #a47e3c;
   -webkit-box-shadow: 0 0 6px #dbc59e;
   -moz-box-shadow: 0 0 6px #dbc59e;
@@ -733,11 +733,11 @@ textarea[readonly] {
 .control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
   color: #b94a48;
 }
-.control-group.error input, .control-group.error textarea {
+.control-group.error input, .control-group.error select, .control-group.error textarea {
   color: #b94a48;
   border-color: #b94a48;
 }
-.control-group.error input:focus, .control-group.error textarea:focus {
+.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
   border-color: #953b39;
   -webkit-box-shadow: 0 0 6px #d59392;
   -moz-box-shadow: 0 0 6px #d59392;
@@ -751,11 +751,11 @@ textarea[readonly] {
 .control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
   color: #468847;
 }
-.control-group.success input, .control-group.success textarea {
+.control-group.success input, .control-group.success select, .control-group.success textarea {
   color: #468847;
   border-color: #468847;
 }
-.control-group.success input:focus, .control-group.success textarea:focus {
+.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
   border-color: #356635;
   -webkit-box-shadow: 0 0 6px #7aba7b;
   -moz-box-shadow: 0 0 6px #7aba7b;
-- 
cgit v1.2.3


From 06017b26ca5a9c835edb9d42188431fa30c7e499 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 11:47:36 -0800
Subject: fix bottom visual bug on carousel images

---
 bootstrap.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'bootstrap.css')

diff --git a/bootstrap.css b/bootstrap.css
index 4bffde24d..7a538c717 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 Jan 25 11:31:57 PST 2012
+ * Date: Wed Jan 25 11:47:25 PST 2012
  */
 article,
 aside,
@@ -2924,6 +2924,10 @@ a.thumbnail:hover {
   -o-transition: 0.6s ease-in-out left;
   transition: 0.6s ease-in-out left;
 }
+.carousel .item > img {
+  display: block;
+  line-height: 1;
+}
 .carousel .active, .carousel .next, .carousel .prev {
   display: block;
 }
-- 
cgit v1.2.3