misc updates to docs and form bug fix

4 files changed, 20 insertions, 5 deletions

diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index a902aaba6a..d8f75c386a 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@ -719,6 +719,12 @@ form .uneditable-input {
   -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
 }
+form :-moz-placeholder {
+  color: #bfbfbf;
+}
+form ::-webkit-input-placeholder {
+  color: #bfbfbf;
+}
 form input[type=text],
 form input[type=password],
 form select,
@@ -875,7 +881,7 @@ div.input-prepend .add-on, div.input-append .add-on {
   height: 18px;
   text-align: center;
   text-shadow: 0 1px 0 #fff;
-  border: 1px solid #bbb;
+  border: 1px solid #ccc;
   border-right-width: 0;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css
index 8650c0f79b..b71e1ab34a 100644
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@ -88,6 +88,8 @@ form input[type=text],form input[type=password],form textarea,form select,form .
 form select,form input[type=file]{height:27px;line-height:27px;}
 form textarea{height:auto;}
 form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);}
+form :-moz-placeholder{color:#bfbfbf;}
+form ::-webkit-input-placeholder{color:#bfbfbf;}
 form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
 form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
 form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;}
@@ -110,7 +112,7 @@ div.inline-inputs input.mini{width:60px;}
 div.inline-inputs input.small{width:90px;}
 div.inline-inputs span{padding:0 2px 0 1px;}
 div.input-prepend input[type=text],div.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-div.input-prepend .add-on,div.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #bbb;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+div.input-prepend .add-on,div.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 div.input-prepend .active,div.input-append .active{background:#a9dba9;border-color:#46a546;}
 div.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
 div.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;}
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 8a74c2eb3c..4b377f7043 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -35,8 +35,8 @@ $(document).ready(function(){
     }
   });
   
-  // Disable certain links in docs
-  $('ul.tabs a, ul.pills a, .pagination a').click(function(e) {
+  // Disable certain links and buttons in docs
+  $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function(e) {
     e.preventDefault();
   });
 
diff --git a/lib/forms.less b/lib/forms.less
index 74aa7a4dff..4a1c359e35 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -79,6 +79,13 @@ form {
     border-color: #ccc;
     .box-shadow(inset 0 1px 2px rgba(0,0,0,.075));
   }
+  // Placeholder text gets special styles; can't be bundled together though for some reason
+  :-moz-placeholder {
+    color: @grayLight;
+  }
+  ::-webkit-input-placeholder {
+    color: @grayLight;
+  }
   // Focus states
   input[type=text],
   input[type=password],
@@ -229,7 +236,7 @@ div.input-append {
     height: 18px;
     text-align: center;
     text-shadow: 0 1px 0 #fff;
-    border: 1px solid #bbb;
+    border: 1px solid #ccc;
     border-right-width: 0;
     .border-radius(3px 0 0 3px);
   }