Merge branch 'master' of github.com:twitter/bootstrap

Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html

3 files changed, 59 insertions, 21 deletions

diff --git a/lib/forms.less b/lib/forms.less
index 590326034..4265f8e59 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -114,7 +114,7 @@ form {
   }
 
   // Error styles
-  .error {
+  div.error {
     background: lighten(@red, 57%);
     padding: 10px 0;
     margin: -10px 0 10px;
@@ -353,6 +353,13 @@ form.form-stacked {
       }
     }
   }
+  div.error {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+    margin-top: 0;
+    margin-left: -10px;
+  }
   .actions {
     margin-left: -20px;
     padding-left: 20px;
diff --git a/lib/preboot.less b/lib/preboot.less
index 15f1c4c3c..bf20b53fe 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -145,43 +145,43 @@
 // Border Radius
 .border-radius(@radius: 5px) {
   -webkit-border-radius: @radius;
-  -moz-border-radius: @radius;
-  border-radius: @radius;
+     -moz-border-radius: @radius;
+          border-radius: @radius;
 }
 
 // Drop shadows
 .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
   -webkit-box-shadow: @shadow;
-  -moz-box-shadow: @shadow;
-  box-shadow: @shadow;
+     -moz-box-shadow: @shadow;
+          box-shadow: @shadow;
 }
 
 // Transitions
 .transition(@transition) {
 	-webkit-transition: @transition;
-	-moz-transition: @transition;
-	transition: @transition;
+	   -moz-transition: @transition;
+	        transition: @transition;
 }
 
 // Background clipping
 .background-clip(@clip) {
 	-webkit-background-clip: @clip;
-	-moz-background-clip: @clip;
-	background-clip: @clip;
+	   -moz-background-clip: @clip;
+	        background-clip: @clip;
 }
 
 // CSS3 Content Columns
 .content-columns(@columnCount, @columnGap: 20px) {
 	-webkit-column-count: @columnCount;
-	-webkit-column-gap: @columnGap;
-	-moz-column-count: @columnCount;
-	-moz-column-gap: @columnGap;
-	column-count: @columnCount;
-	column-gap: @columnGap;
+	   -moz-column-count: @columnCount;
+          column-count: @columnCount;
+  -webkit-column-gap: @columnGap;
+	   -moz-column-gap: @columnGap;
+          column-gap: @columnGap;
 }
 
 // Buttons
-.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) {
+/*.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) {
   display: inline-block;
   #gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%));
   padding: @padding;
@@ -200,7 +200,7 @@
     color: @textColor;
     text-decoration: none;
   }
-}
+}*/
 
 // Add an alphatransparency value to any background or border color (via Elyse Holladay)
 #translucent {
@@ -262,6 +262,6 @@
 .opacity(@opacity: 100) {
 	filter: e(%("alpha(opacity=%d)", @opacity));
 	-khtml-opacity: @opacity / 100;
-	-moz-opacity: @opacity / 100;
-	opacity: @opacity / 100;
+	  -moz-opacity: @opacity / 100;
+	       opacity: @opacity / 100;
 }
\ No newline at end of file
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 864aea52f..735c2b129 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -51,7 +51,7 @@ html, body {
   background-color: #fff;
 }
 body {
-  margin: 60px 0 0; // Add margin to the top of the page for the topbar
+  margin: 0;
   #font > .sans-serif(normal,@basefont,@baseline);
   color: @gray;
   text-rendering: optimizeLegibility;
@@ -87,6 +87,7 @@ a {
   color: @linkColor;
   text-decoration: none;
   line-height: inherit;
+  font-weight: inherit;
   &:hover {
     color: @linkColorHover;
     text-decoration: underline;
@@ -95,10 +96,40 @@ a {
 
 // Buttons
 .btn {
-  .button();
+  display: inline-block;
+  #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
+  padding: 4px 14px;
+  text-shadow: 0 1px 1px rgba(255,255,255,.75);
+  color: #333;
+  font-size: 13px;
+  line-height: @baseline;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  .border-radius(4px);
+  @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+  &:hover {
+    background-position: 0 -15px;
+    color: #333;
+    text-decoration: none;
+  }
+}
+.primary {
+  #gradient > .vertical(#049CDB, #0064CD);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  border: 1px solid darken(#0064CD, 10%);
+  border-bottom-color: darken(#0064CD, 15%);
+  &:hover {
+    color: #fff;
+  }
+}
+
+.btn {
+  //.button(#1174C6);
   .transition(.1s linear all);
   &.primary {
-    #gradient > .vertical(@blue, @blueDark);
+    //#gradient > .vertical(@blue, @blueDark);
     color: #fff;
     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     border-color: @blueDark @blueDark darken(@blueDark, 15%);