Merge remote branch 'origin/master' into 1.2-wip

Makefile

 DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.1.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
+BOOTSTRAP = ./bootstrap-1.1.1.css
+BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
 LESS_COMPESSOR ?= `which lessc`
 WATCHR ?= `which watchr`

README.md

@@ -18,7 +18,7 @@ Here's what the LESS version looks like:
 
 Or if you prefer, the standard css way:
 
-    <link rel="stylesheet" type="text/css" href="bootstrap-1.1.0.css">
+    <link rel="stylesheet" type="text/css" href="bootstrap-1.1.1.css">
 
 For more info, refer to the docs!
 

docs/assets/css/docs.css

@@ -171,7 +171,7 @@ div.mini-layout div {
 div.mini-layout div.mini-layout-body {
   background-color: #dceaf4;
   margin: 0 auto;
-  width: 450px;
+  width: 340px;
   height: 340px;
 }
 div.mini-layout.fluid div.mini-layout-sidebar,
@@ -185,7 +185,7 @@ div.mini-layout.fluid div.mini-layout-sidebar {
   height: 340px;
 }
 div.mini-layout.fluid div.mini-layout-body {
-  width: 400px;
+  width: 300px;
   margin-left: 10px;
 }
 /* Topbar special styles

docs/assets/js/application.js

 $(document).ready(function(){
 
+  // Google code prettify
+  // ====================
+
+  prettyPrint();
+
   // scroll spy logic
   // ================
 
   var activeTarget,
-      $window = $(window),
       position = {},
+      $window = $(window),
       nav = $('body > .topbar li a'),
       targets = nav.map(function () {
         return $(this).attr('href');

examples/hero.html

@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.1.0.css" rel="stylesheet">
+    <link href="../bootstrap-1.1.1.css" rel="stylesheet">
 
     <!-- Le fav and touch icons -->
     <link rel="shortcut icon" href="images/favicon.ico">
@@ -25,7 +25,7 @@
 
     <div class="topbar">
       <div class="fill">
-        <div class="container fixed">
+        <div class="container">
           <h3><a href="#">Project name</a></h3>
           <ul>
             <li class="active"><a href="#">Home</a></li>

lib/bootstrap.less

 /*!
- * Bootstrap v1.1.0
+ * Bootstrap v1.1.1
  *
  * Copyright 2011 Twitter, Inc
  * Licensed under the Apache License v2.0

lib/forms.less

@@ -8,9 +8,10 @@
 
 form {
   margin-bottom: @baseline;
+}
 
-  // Groups of fields with labels on top (legends)
-  fieldset {
+// Groups of fields with labels on top (legends)
+fieldset {
   margin-bottom: @baseline;
   padding-top: @baseline;
   legend {
@@ -22,20 +23,23 @@ form {
     *line-height: 1.5; /* IE6-7 */
     color: @grayDark;
   }
-  }
+}
 
-  // Parent element that clears floats and wraps labels and fields together
-  .clearfix {
+// Parent element that clears floats and wraps labels and fields together
+.clearfix {
   margin-bottom: @baseline;
-  }
+}
 
-  // Set font for forms
-  label, input, select, textarea {
+// Set font for forms
+label,
+input,
+select,
+textarea {
   #font > .sans-serif(normal,13px,normal);
-  }
+}
 
-  // Float labels left
-  label {
+// Float labels left
+label {
   padding-top: 6px;
   font-size: 13px;
   line-height: 18px;
@@ -43,28 +47,27 @@ form {
   width: 130px;
   text-align: right;
   color: @grayDark;
-  }
+}
 
-  // Shift over the inside div to align all label's relevant content
-  div.input {
+// Shift over the inside div to align all label's relevant content
+div.input {
   margin-left: 150px;
-  }
+}
 
-  // Checkboxs and radio buttons
-  input[type=checkbox],
-  input[type=radio] {
+// Checkboxs and radio buttons
+input[type=checkbox],
+input[type=radio] {
   cursor: pointer;
-  }
+}
 
-  // Inputs, Textareas, Selects
-  input[type=text],
-  input[type=password],
-  textarea,
-  select,
-  .uneditable-input {
+// Inputs, Textareas, Selects
+input[type=text],
+input[type=password],
+textarea,
+select,
+.uneditable-input {
   display: inline-block;
   width: 210px;
-    margin: 0;
   padding: 4px;
   font-size: 13px;
   line-height: @baseline;
@@ -72,49 +75,49 @@ form {
   color: @gray;
   border: 1px solid #ccc;
   .border-radius(3px);
-  }
-  select,
-  input[type=file] {
+}
+select,
+input[type=file] {
   height: @baseline * 1.5;
   line-height: @baseline * 1.5;
-  }
-  textarea {
+}
+textarea {
   height: auto;
-  }
-  .uneditable-input {
+}
+.uneditable-input {
   background-color: #eee;
   display: block;
   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 {
+// Placeholder text gets special styles; can't be bundled together though for some reason
+:-moz-placeholder {
   color: @grayLight;
-  }
-  ::-webkit-input-placeholder {
+}
+::-webkit-input-placeholder {
   color: @grayLight;
-  }
+}
 
-  // Focus states
-  input[type=text],
-  input[type=password],
-  select, textarea {
+// Focus states
+input[type=text],
+input[type=password],
+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 {
+}
+input[type=text]:focus,
+input[type=password]:focus,
+textarea:focus {
   outline: none;
   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 {
+// Error styles
+form div.error {
   background: lighten(@red, 57%);
   padding: 10px 0;
   margin: -10px 0 10px;
@@ -143,39 +146,38 @@ form {
       color: darken(@error-text, 10%);
     }
   }
-  }
+}
 
-  // Form element sizes
-  .input-mini, input.mini, textarea.mini, select.mini {
+// Form element sizes
+.input-mini, input.mini, textarea.mini, select.mini {
   width: 60px;
-  }
-  .input-small, input.small, textarea.small, select.small {
+}
+.input-small, input.small, textarea.small, select.small {
   width: 90px;
-  }
-  .input-medium, input.medium, textarea.medium, select.medium {
+}
+.input-medium, input.medium, textarea.medium, select.medium {
   width: 150px;
-  }
-  .input-large, input.large, textarea.large, select.large {
+}
+.input-large, input.large, textarea.large, select.large {
   width: 210px;
-  }
-  .input-xlarge, input.xlarge, textarea.xlarge, select.xlarge {
+}
+.input-xlarge, input.xlarge, textarea.xlarge, select.xlarge {
   width: 270px;
-  }
-  .input-xxlarge, input.xxlarge, textarea.xxlarge, select.xxlarge {
+}
+.input-xxlarge, input.xxlarge, textarea.xxlarge, select.xxlarge {
   width: 530px;
-  }
-  textarea.xxlarge {
+}
+textarea.xxlarge {
   overflow-y: scroll;
-  }
+}
 
-  // Turn off focus for disabled (read-only) form elements
-  input[readonly]:focus,
-  textarea[readonly]:focus,
-  input.disabled {
+// Turn off focus for disabled (read-only) form elements
+input[readonly]:focus,
+textarea[readonly]:focus,
+input.disabled {
   background: #f5f5f5;
   border-color: #ddd;
   .box-shadow(none);
-  }
 }
 
 // Actions (the buttons)
@@ -262,13 +264,11 @@ form {
     border-color: @green;
   }
 }
-
 .input-prepend {
   .add-on {
     *margin-top: 1px; /* IE6-7 */
   }
 }
-
 .input-append {
   input[type=text],
   input[type=password] {
@@ -322,7 +322,7 @@ form {
 }
 
 // Stacked forms
-form.form-stacked {
+.form-stacked {
   padding-left: 20px;
   fieldset {
     padding-top: @baseline / 2;

lib/patterns.less

@@ -288,21 +288,94 @@ footer {
   }
 }
 
+// BUTTON STYLES
+// -------------
 
-// ERROR STYLES
-// ------------
 
-// Setup a mixin to colorize different alerts
-.alertTheme(@primaryColor, @secondaryColor) {
-  #gradient > .vertical(@primaryColor, @secondaryColor);
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  border-color: darken(@secondaryColor, 10%) darken(@secondaryColor, 10%) darken(@secondaryColor, 15%);
-  border-color: rgba(0,0,0,.05) rgba(0,0,0,.075) rgba(0,0,0,.125);
+// Base .btn styles
+.btn {
+  // Button Base
+  cursor: pointer;
+  display: inline-block;
+  #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
+  padding: 5px 14px 6px;
+  text-shadow: 0 1px 1px rgba(255,255,255,.75);
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  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 Button Type
+  &.primary {
+    color:#fff;
+    .gradientBar(@blue, @blueDark)
+  }
+
+   // Transitions
+  .transition(.1s linear all);
+
+  // Active and Disabled states
+  &.disabled {
+    cursor: default;
+    background-image: none;
+    .opacity(65);
+  }
+
+  &:disabled {
+    // disabled pseudo can't be included with .disabled
+    // def because IE8 and below will drop it ;_;
+    cursor: default;
+    background-image: none;
+    .opacity(65);
+  }
+
+  &:active {
+    @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
+    .box-shadow(@shadow);
+  }
+
+  // Button Sizes
+  &.large {
+    font-size: 16px;
+    line-height: normal;
+    padding: 9px 14px 9px;
+    .border-radius(6px);
+  }
+
+  &.small {
+    padding: 7px 9px 7px;
+    font-size: 11px;
+  }
+
 }
 
+// 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;
+  }
+}
+
+
+
+// ERROR STYLES
+// ------------
+
 // Base alert styles
-.alert {
-  .alertTheme(#fceec1, #eedc94);
+.alert-message {
+  .gradientBar(#fceec1, #eedc94); // warning by default
   margin-bottom: @baseline;
   padding: 7px 14px;
   color: @grayDark;
@@ -311,6 +384,7 @@ footer {
   border-style: solid;
   .border-radius(4px);
   .box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
+
   // Remove extra margin from content
   h5 {
     line-height: @baseline;
@@ -323,26 +397,11 @@ footer {
     margin-bottom: 2px;
     line-height: 28px;
   }
-  // Provide actions with buttons
   .btn {
+    // Provide actions with buttons
     .box-shadow(0 1px 0 rgba(255,255,255,.25));
   }
-}
-// Alternate alerts
-.alert-error,
-.alert-success,
-.alert-info,
-.alert-error h5,
-.alert-success h5,
-.alert-info h5 {
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.3);
-}
-.alert-error    { .alertTheme(#f56a66, #d6463e); }
-.alert-success  { .alertTheme(#62c462, #57a957); }
-.alert-info     { .alertTheme(#6bd0ee, #36b3d9); }
-// Close action
-.close {
+  .close {
     float: right;
     margin-top: -2px;
     color: @black;
@@ -355,35 +414,42 @@ footer {
       text-decoration: none;
       .opacity(40);
     }
-}
-// Block-level alerts
-.alert-block {
+  }
+
+  &.block-message {
     background-image: none;
     background-color: lighten(#fceec1, 5%);
     padding: 14px;
     border-color: #fceec1;
     .box-shadow(none);
+
     p {
       margin-right: 30px;
     }
     .alert-actions {
       margin-top: 5px;
     }
-}
-.alert-block.error {
+    &.error,
+    &.success,
+    &.info {
+      color: @grayDark;
+      text-shadow: 0 1px 0 rgba(255,255,255,.5);
+    }
+    &.error {
       background-color: lighten(#f56a66, 25%);
       border-color: lighten(#f56a66, 20%);
-}
-.alert-block.success {
+    }
+    &.success {
       background-color: lighten(#62c462, 30%);
       border-color: lighten(#62c462, 25%);
-}
-.alert-block.info {
+    }
+    &.info {
       background-color: lighten(#6bd0ee, 25%);
       border-color: lighten(#6bd0ee, 20%);
+    }
+  }
 }
 
-
 // NAVIGATION
 // ----------
 
@@ -484,7 +550,7 @@ footer {
       }
       &.disabled a,
       &.disabled a:hover {
-        background-color: none;
+        background-color: transparent;
         color: @grayLight;
       }
       &.next a {
@@ -558,6 +624,7 @@ footer {
     .border-radius(0 0 6px 6px);
     .box-shadow(inset 0 1px 0 #fff);
     .clearfix();
+    margin-bottom: 0;
     .btn {
       float: right;
       margin-left: 10px;

lib/preboot.less

@@ -170,14 +170,6 @@
           column-gap: @columnGap;
 }
 
-// Buttons
-.btnColoring(@primaryColor, @secondaryColor) {
-  #gradient > .vertical(@primaryColor, @secondaryColor);
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-}
-
 // Add an alphatransparency value to any background or border color (via Elyse Holladay)
 #translucent {
   .background(@color: @white, @alpha: 1) {
@@ -189,6 +181,42 @@
 	}
 }
 
+// Gradient Bar Colors for buttons and allerts
+.gradientBar(@primaryColor, @secondaryColor) {
+  #gradient > .vertical(@primaryColor, @secondaryColor);
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+}
+// Shared colors for buttons and alerts
+.btn,
+.alert-message {
+  // Set text color
+  &.danger,
+  &.danger:hover,
+  &.error,
+  &.error:hover,
+  &.success,
+  &.success:hover,
+  &.info,
+  &.info:hover {
+    color: @white
+  }
+  // Danger and error appear as red
+  &.danger,
+  &.error {
+    .gradientBar(#ee5f5b, #c43c35);
+  }
+  // Success appears as green
+  &.success {
+    .gradientBar(#62c462, #57a957);
+  }
+  // Info appears as a neutral blue
+  &.info {
+    .gradientBar(#5bc0de, #339bb9);
+  }
+}
+
 // Gradients
 #gradient {
   .horizontal (@startColor: #555, @endColor: #333) {
@@ -206,12 +234,12 @@
     background-color: @endColor;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
-    background-image: -moz-linear-gradient(@startColor, @endColor); // FF 3.6+
-    background-image: -ms-linear-gradient(@startColor, @endColor); // IE10
+    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
+    background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(@startColor, @endColor); // The standard
+    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(top, @startColor, @endColor); // The standard
   }
   .directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
     background-color: @endColor;

lib/reset.less

@@ -4,7 +4,7 @@
 
 
 // ERIC MEYER RESET
-// ----------------
+// --------------------------------------------------
 
 html, body { margin: 0; padding: 0; }
 h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
@@ -13,9 +13,134 @@ ol, ul { list-style: none; }
 q:before, q:after, blockquote:before, blockquote:after { content: ""; }
 
 
-// HTML5
-// -----
+// Normalize.css
+// Pulling in select resets form the normalize.css project
+// --------------------------------------------------
 
-header, section, footer, article, aside {
+// Display in IE6-9 and FF3
+// -------------------------
+// Source: http://github.com/necolas/normalize.css
+html {
+  overflow-y: scroll;
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+// Focus states
+a:focus {
+  outline: thin dotted;
+}
+
+// Display in IE6-9 and FF3
+// -------------------------
+// Source: http://github.com/necolas/normalize.css
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
   display: block;
 }
+
+// Display block in IE6-9 and FF3
+// -------------------------
+// Source: http://github.com/necolas/normalize.css
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+// Prevents modern browsers from displaying 'audio' without controls
+// -------------------------
+// Source: http://github.com/necolas/normalize.css
+audio:not([controls]) {
+    display: none;
+}
+
+// Prevents sub and sup affecting line-height in all browsers
+// -------------------------
+// Source: http://github.com/necolas/normalize.css
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+
+// Img border in a's and image quality
+// -------------------------
+// Source: http://github.com/necolas/normalize.css
+img {
+    border: 0;
+    -ms-interpolation-mode: bicubic;
+}
+
+// Forms
+// -------------------------
+// Source: http://github.com/necolas/normalize.css
+
+// Font size in all browsers, margin changes, misc consistency
+button,
+input,
+select,
+textarea {
+  font-size: 100%;
+  margin: 0;
+  vertical-align: baseline;
+  *vertical-align: middle;
+}
+button,
+input {
+  line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
+  *overflow: visible; // Inner spacing ie IE6/7
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
+  border: 0;
+  padding: 0;
+}
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer; // Cursors on all buttons applied consistently
+  -webkit-appearance: button; // Style clicable inputs in iOS
+}
+input[type="search"] { // Appearance in Safari/Chrome
+  -webkit-appearance: textfield;
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+}
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
+}
+textarea {
+  overflow: auto; // Remove vertical scrollbar in IE6-9
+  vertical-align: top; // Readability and alignment cross-browser
+}
+
+// Tables
+// -------------------------
+// Source: http://github.com/necolas/normalize.css
+
+// Remove spacing between table cells
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
\ No newline at end of file

lib/scaffolding.less

@@ -81,20 +81,20 @@ body {
 }
 
 // Container (centered, fixed-width layouts)
-div.container {
+.container {
   width: 940px;
   margin: 0 auto;
 }
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
-div.container-fluid {
+.container-fluid {
   padding: 0 20px;
   .clearfix();
-  div.sidebar {
+  .sidebar {
     float: left;
     width: 220px;
   }
-  div.content {
+  .content {
     min-width: 700px;
     max-width: 1180px;
     margin-left: 240px;
@@ -119,79 +119,79 @@ a {
 
 // Buttons
 .btn {
-  // Button Base
-  cursor: pointer;
   display: inline-block;
   #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
-  padding: 5px 14px 6px;
+  padding: 4px 14px;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   color: #333;
   font-size: 13px;
-  line-height: normal;
+  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;
   }
-
-   // Transitions
-  .transition(.1s linear all);
-
-  // Colored Button Types
-  &.primary,
-  &.danger,
-  &.danger:hover,
-  &.primary:hover {
+}
+.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 {
-    .btnColoring(@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%);
+    border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+    &:hover {
+      color: #fff;
     }
-
-  &.danger {
-    .btnColoring(lighten(@red, 15%), @red)
   }
-
-  // Active and Disabled states
+  &.large {
+    font-size: 16px;
+    line-height: 28px;
+    .border-radius(6px);
+  }
+  &.small {
+    padding-right: 9px;
+    padding-left: 9px;
+    font-size: 11px;
+  }
   &.disabled {
-    cursor: default;
     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 {
-    // disabled pseudo can't be included with .disabled
-    // def because IE8 and below will drop it ;_;
-    cursor: default;
     background-image: none;
     .opacity(65);
+    cursor: default;
+    .box-shadow(none);
+    &.primary {
+      color: #fff;
+    }
   }
-
   &:active {
-    @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
+    @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);
   }
-
-  // Button Sizes
-  &.large {
-    font-size: 16px;
-    line-height: normal;
-    padding: 9px 14px 9px;
-    .border-radius(6px);
-  }
-
-  &.small {
-    padding: 7px 9px 7px;
-    font-size: 11px;
-  }
-
 }
 
 // Help Firefox not be a jerk about adding extra padding to buttons

lib/type.less

@@ -130,7 +130,7 @@ em {
   line-height: inherit;
 }
 .muted {
-  color: @grayLighter;
+  color: @grayLight;
 }
 
 // Blockquotes
@@ -181,5 +181,8 @@ pre {
   border: 1px solid #ccc;
   border: 1px solid rgba(0,0,0,.15);
   .border-radius(3px);
+  white-space: pre;
   white-space: pre-wrap;
+  word-wrap: break-word;
+
 }
\ No newline at end of file