Merge branch 'master' of http://git.local.twitter.com/bootstrap

Conflicts:
	lib/bootstrap.less

lib/bootstrap.less

@@ -1,14 +1,13 @@
- /*!
-  * Bootstrap v0.0.1
-  *
-  * Copyright 2011 Twitter, Inc
-  * Licensed under the Apache License v2.0
-  * http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Made with love by two broheims, @mdo and @fat
-  * Date: {{ date }}
-  */
-
+/*!
+ * Bootstrap v1.0.0
+ *
+ * Copyright 2011 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Date: {{ date }}
+ */
 
 // CSS Reset
 @import "reset.less";

lib/forms.less

@@ -62,7 +62,7 @@ form {
     line-height: @baseline;
     height: @baseline;
     color: @gray;
-    border: 1px solid #bbb;
+    border: 1px solid #ccc;
     .border-radius(3px);
   }
   select,
@@ -85,13 +85,15 @@ form {
   select, textarea {
     @transition: border linear .2s, box-shadow linear .2s;
     .transition(@transition);
+    .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
   }
   input[type=text]:focus,
   input[type=password]:focus,
   textarea:focus {
     outline: none;
-    border-color: rgba(82,168,236,.75);
-    .box-shadow(0 0 8px rgba(82,168,236,.5));
+    border-color: rgba(82,168,236,.8);
+    @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
+    .box-shadow(@shadow);
   }
   // Error styles
   div.error {

lib/scaffolding.less

@@ -103,16 +103,13 @@ a {
     background-image: none;
     .opacity(65);
     cursor: default;
-  }
-  &:focus {
-
   }
   &:active {
     @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);
   }
 }
-// Help Firefox not be a douche about adding extra padding to buttons
+// Help Firefox not be a jerk about adding extra padding to buttons
 button.btn,
 input[type=submit].btn {
   &::-moz-focus-inner {