1 files changed, 25 insertions, 27 deletions
diff --git a/bootstrap.css b/bootstrap.css
index aa13815fd..0014fcdcc 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: Thu Jan  5 15:48:31 PST 2012
+ * Date: Thu Jan  5 21:43:09 PST 2012
  */
 html, body {
   margin: 0;
@@ -261,7 +261,6 @@ a:hover {
   clear: both;
 }
 [class*="span"] {
-  display: inline;
   float: left;
   margin-left: 20px;
 }
@@ -555,10 +554,11 @@ input,
 textarea,
 select,
 .uneditable-input {
-  display: inline-block;
+  display: block;
   width: 210px;
   height: 18px;
   padding: 4px;
+  margin-bottom: 9px;
   font-size: 13px;
   line-height: 18px;
   color: #555555;
@@ -670,7 +670,6 @@ input.span1,
 textarea.span1,
 select.span1,
 .uneditable-input.span1 {
-  display: inline-block;
   float: none;
   width: 50px;
   margin-left: 0;
@@ -679,7 +678,6 @@ input.span2,
 textarea.span2,
 select.span2,
 .uneditable-input.span2 {
-  display: inline-block;
   float: none;
   width: 130px;
   margin-left: 0;
@@ -688,7 +686,6 @@ input.span3,
 textarea.span3,
 select.span3,
 .uneditable-input.span3 {
-  display: inline-block;
   float: none;
   width: 210px;
   margin-left: 0;
@@ -697,7 +694,6 @@ input.span4,
 textarea.span4,
 select.span4,
 .uneditable-input.span4 {
-  display: inline-block;
   float: none;
   width: 290px;
   margin-left: 0;
@@ -706,7 +702,6 @@ input.span5,
 textarea.span5,
 select.span5,
 .uneditable-input.span5 {
-  display: inline-block;
   float: none;
   width: 370px;
   margin-left: 0;
@@ -715,7 +710,6 @@ input.span6,
 textarea.span6,
 select.span6,
 .uneditable-input.span6 {
-  display: inline-block;
   float: none;
   width: 450px;
   margin-left: 0;
@@ -724,7 +718,6 @@ input.span7,
 textarea.span7,
 select.span7,
 .uneditable-input.span7 {
-  display: inline-block;
   float: none;
   width: 530px;
   margin-left: 0;
@@ -733,7 +726,6 @@ input.span8,
 textarea.span8,
 select.span8,
 .uneditable-input.span8 {
-  display: inline-block;
   float: none;
   width: 610px;
   margin-left: 0;
@@ -742,7 +734,6 @@ input.span9,
 textarea.span9,
 select.span9,
 .uneditable-input.span9 {
-  display: inline-block;
   float: none;
   width: 690px;
   margin-left: 0;
@@ -751,7 +742,6 @@ input.span10,
 textarea.span10,
 select.span10,
 .uneditable-input.span10 {
-  display: inline-block;
   float: none;
   width: 770px;
   margin-left: 0;
@@ -760,7 +750,6 @@ input.span11,
 textarea.span11,
 select.span11,
 .uneditable-input.span11 {
-  display: inline-block;
   float: none;
   width: 850px;
   margin-left: 0;
@@ -769,7 +758,6 @@ input.span12,
 textarea.span12,
 select.span12,
 .uneditable-input.span12 {
-  display: inline-block;
   float: none;
   width: 930px;
   margin-left: 0;
@@ -778,7 +766,6 @@ input.span13,
 textarea.span13,
 select.span13,
 .uneditable-input.span13 {
-  display: inline-block;
   float: none;
   width: 1010px;
   margin-left: 0;
@@ -787,7 +774,6 @@ input.span14,
 textarea.span14,
 select.span14,
 .uneditable-input.span14 {
-  display: inline-block;
   float: none;
   width: 1090px;
   margin-left: 0;
@@ -796,7 +782,6 @@ input.span15,
 textarea.span15,
 select.span15,
 .uneditable-input.span15 {
-  display: inline-block;
   float: none;
   width: 1170px;
   margin-left: 0;
@@ -805,7 +790,6 @@ input.span16,
 textarea.span16,
 select.span16,
 .uneditable-input.span16 {
-  display: inline-block;
   float: none;
   width: 1250px;
   margin-left: 0;
@@ -890,13 +874,13 @@ textarea[readonly] {
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
   cursor: not-allowed;
 }
-:-moz-placeholder {
+input:-moz-placeholder {
   color: #999999;
 }
-::-webkit-input-placeholder {
+input::-webkit-input-placeholder {
   color: #999999;
 }
-.help-text {
+.help-block {
   margin-top: 5px;
   margin-bottom: 0;
   color: #999999;
@@ -911,11 +895,8 @@ textarea[readonly] {
   display: inline;
   padding-left: 5px;
 }
-.help-block {
-  display: block;
-  max-width: 600px;
-}
 .input-prepend, .input-append {
+  margin-bottom: 5px;
   zoom: 1;
 }
 .input-prepend:before,
@@ -977,10 +958,27 @@ textarea[readonly] {
   border-radius: 0 3px 3px 0;
 }
 .search-form .search-query {
+  padding-left: 14px;
+  padding-right: 14px;
   -webkit-border-radius: 14px;
   -moz-border-radius: 14px;
   border-radius: 14px;
 }
+.search-form input,
+.inline-form input,
+.horizontal-form input,
+.search-form textarea,
+.inline-form textarea,
+.horizontal-form textarea,
+.search-form select,
+.inline-form select,
+.horizontal-form select,
+.search-form .uneditable-input,
+.inline-form .uneditable-input,
+.horizontal-form .uneditable-input {
+  display: inline-block;
+  margin-bottom: 0;
+}
 .control-group {
   margin-bottom: 18px;
 }
@@ -2554,7 +2552,7 @@ i {
 }
 .btn {
   display: inline-block;
-  padding: 5px 14px 6px;
+  padding: 5px 10px 6px;
   font-size: 13px;
   line-height: normal;
   color: #333;