Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
	README.md
	bootstrap-1.2.0.css

diff --cc README.md
Simple merge

diff --cc bootstrap-1.2.0.css
index afb6b584a504fb6eaaf15626ff3aa551cf2051b0,9f422a2431f88057be03278b787f4f57e25cf6b7..b1cc2f1362c3f629b7d45f023c0913a0cf2c1c2e
--- 1/bootstrap-1.2.0.css
--- 2/bootstrap-1.1.1.css
+++ b/bootstrap-1.2.0.css
@@@ -6,7 -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: Tue Aug 30 23:30:34 PDT 2011
 - * Date: Fri Aug 26 19:31:44 PDT 2011
++ * Date: Tue Aug 30 23:37:26 PDT 2011
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here     that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).

diff --cc docs/index.html
Simple merge

diff --cc lib/scaffolding.less
index c0272908ff03c949ca039d0365cbbaf432ddacb6,ded9a1e5f1764864dc6532ff8f151819788acdfc..a0dee789c65a6d753c9adb1b2625d1d47f845651
--- 1/lib/scaffolding.less
--- 2/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@@ -107,4 -115,90 +107,4 @@@ a 
      color: @linkColorHover;
      text-decoration: underline;
    }
- }
+ }
 -
 -// Buttons
 -.btn {
 -  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);
 -    color: #fff;
 -    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 -    border-color: @blueDark @blueDark darken(@blueDark, 15%);
 -    border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
 -    &:hover {
 -      color: #fff;
 -    }
 -  }
 -  &.large {
 -    font-size: 16px;
 -    line-height: 28px;
 -    .border-radius(6px);
 -  }
 -  &.small {
 -    padding-right: 9px;
 -    padding-left: 9px;
 -    font-size: 11px;
 -  }
 -  &.disabled {
 -    background-image: none;
 -    .opacity(65);
 -    cursor: default;
 -    .box-shadow(none);
 -  }
 -
 -  // this can't be included with the .disabled def because IE8 and below will drop it ;_;
 -  &:disabled {
 -    background-image: none;
 -    .opacity(65);
 -    cursor: default;
 -    .box-shadow(none);
 -    &.primary {
 -      color: #fff;
 -    }
 -  }
 -  &:active {
 -    @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
 -    .box-shadow(@shadow);
 -  }
 -}
 -
 -// Help Firefox not be a jerk about adding extra padding to buttons
 -button.btn,
 -input[type=submit].btn {
 -  &::-moz-focus-inner {
 -      padding: 0;
 -      border: 0;
 -  }
 -}