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

docs/assets/css/bootstrap-responsive.css

@@ -19,20 +19,16 @@
   clear: both;
 }
 .hide-text {
-  border: 0;
   font: 0/0 a;
-  text-shadow: none;
   color: transparent;
+  text-shadow: none;
   background-color: transparent;
+  border: 0;
 }
 .input-block-level {
   display: block;
   width: 100%;
   min-height: 28px;
-  /* Make inputs at least the height of their button counterpart */
-
-  /* Makes inputs behave like true block-level elements */
-
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   -ms-box-sizing: border-box;
@@ -175,10 +171,6 @@
     display: block;
     width: 100%;
     min-height: 28px;
-    /* Make inputs at least the height of their button counterpart */
-  
-    /* Makes inputs behave like true block-level elements */
-  
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;
@@ -302,10 +294,6 @@
     display: block;
     width: 100%;
     min-height: 28px;
-    /* Make inputs at least the height of their button counterpart */
-  
-    /* Makes inputs behave like true block-level elements */
-  
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;
@@ -504,10 +492,6 @@
     display: block;
     width: 100%;
     min-height: 28px;
-    /* Make inputs at least the height of their button counterpart */
-  
-    /* Makes inputs behave like true block-level elements */
-  
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;

docs/assets/js/bootstrap-typeahead.js

@@ -32,6 +32,7 @@
     this.matcher = this.options.matcher || this.matcher
     this.sorter = this.options.sorter || this.sorter
     this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
     this.$menu = $(this.options.menu).appendTo('body')
     this.source = this.options.source
     this.shown = false
@@ -45,11 +46,15 @@
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element
-        .val(val)
+        .val(this.updater(val))
         .change()
       return this.hide()
     }
 
+  , updater: function (item) {
+      return item
+    }
+
   , show: function () {
       var pos = $.extend({}, this.$element.offset(), {
         height: this.$element[0].offsetHeight

docs/assets/js/bootstrap.js

@@ -1565,6 +1565,7 @@
     this.matcher = this.options.matcher || this.matcher
     this.sorter = this.options.sorter || this.sorter
     this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
     this.$menu = $(this.options.menu).appendTo('body')
     this.source = this.options.source
     this.shown = false
@@ -1578,11 +1579,15 @@
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element
-        .val(val)
+        .val(this.updater(val))
         .change()
       return this.hide()
     }
 
+  , updater: function (item) {
+      return item
+    }
+
   , show: function () {
       var pos = $.extend({}, this.$element.offset(), {
         height: this.$element[0].offsetHeight

js/bootstrap-typeahead.js

@@ -32,6 +32,7 @@
     this.matcher = this.options.matcher || this.matcher
     this.sorter = this.options.sorter || this.sorter
     this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
     this.$menu = $(this.options.menu).appendTo('body')
     this.source = this.options.source
     this.shown = false
@@ -45,11 +46,15 @@
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element
-        .val(val)
+        .val(this.updater(val))
         .change()
       return this.hide()
     }
 
+  , updater: function (item) {
+      return item
+    }
+
   , show: function () {
       var pos = $.extend({}, this.$element.offset(), {
         height: this.$element[0].offsetHeight

less/buttons.less

@@ -13,23 +13,19 @@
   margin-bottom: 0; // For input.btn
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
+  *line-height: 20px;
   color: @grayDark;
   text-align: center;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   vertical-align: middle;
+  cursor: pointer;
   .buttonBackground(@btnBackground, @btnBackgroundHighlight);
   border: 1px solid @btnBorder;
+  *border: 0; // Remove the border to prevent IE7's black border on input:focus
   border-bottom-color: darken(@btnBorder, 10%);
   .border-radius(4px);
+  .ie7-restore-left-whitespace(); // Give IE7 some love
   .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-  cursor: pointer;
-
-  // Give IE7 some love
-  .ie7-restore-left-whitespace();
-
-  /* Remove the border to prevent IE7's black border on input:focus */
-  *border: 0;
-  *line-height: 20px;
 }
 
 // Hover state
@@ -53,19 +49,19 @@
 // Active state
 .btn.active,
 .btn:active {
-  background-image: none;
-  .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
   background-color: darken(@white, 10%);
   background-color: darken(@white, 15%) e("\9");
+  background-image: none;
   outline: 0;
+  .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
 }
 
 // Disabled state
 .btn.disabled,
 .btn[disabled] {
   cursor: default;
-  background-image: none;
   background-color: darken(@white, 10%);
+  background-image: none;
   .opacity(65);
   .box-shadow(none);
 }
@@ -120,8 +116,8 @@
 .btn-info:hover,
 .btn-inverse,
 .btn-inverse:hover {
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   color: @white;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 }
 // Provide *some* extra contrast for those who can get it
 .btn-primary.active,

less/close.less

@@ -12,8 +12,8 @@
   &:hover {
     color: @black;
     text-decoration: none;
-    .opacity(40);
     cursor: pointer;
+    .opacity(40);
   }
 }
 

less/code.less

@@ -27,14 +27,14 @@ pre {
   margin: 0 0 @baseLineHeight / 2;
   font-size: @baseFontSize * .925; // 13px to 12px
   line-height: @baseLineHeight;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
   background-color: #f5f5f5;
   border: 1px solid #ccc; // fallback for IE7-8
   border: 1px solid rgba(0,0,0,.15);
   .border-radius(4px);
-  white-space: pre;
-  white-space: pre-wrap;
-  word-break: break-all;
-  word-wrap: break-word;
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {

less/component-animations.less

@@ -2,18 +2,18 @@
 // --------------------
 
 .fade {
-  .transition(opacity .15s linear);
   opacity: 0;
+  .transition(opacity .15s linear);
   &.in {
     opacity: 1;
   }
 }
 
 .collapse {
-  .transition(height .35s ease);
   position:relative;
-  overflow:hidden;
   height: 0;
+  overflow:hidden;
+  .transition(height .35s ease);
   &.in {
     height: auto;
   }

less/dropdowns.less

@@ -22,11 +22,11 @@
   width: 0;
   height: 0;
   vertical-align: top;
-  border-left:  4px solid transparent;
-  border-right: 4px solid transparent;
   border-top:   4px solid @black;
-  .opacity(30);
+  border-right: 4px solid transparent;
+  border-left:  4px solid transparent;
   content: "";
+  .opacity(30);
 }
 
 // Place the caret
@@ -46,8 +46,8 @@
   top: 100%;
   left: 0;
   z-index: @zindexDropdown;
-  float: left;
   display: none; // none by default, but block on "open" of the menu
+  float: left;
   min-width: 160px;
   padding: 4px 0;
   margin: 1px 0 0; // override default ul
@@ -55,13 +55,13 @@
   background-color: @dropdownBackground;
   border: 1px solid #ccc;
   border: 1px solid rgba(0,0,0,.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
   .border-radius(5px);
   .box-shadow(0 5px 10px rgba(0,0,0,.2));
   -webkit-background-clip: padding-box;
      -moz-background-clip: padding;
           background-clip: padding-box;
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
 
   // Aligns the dropdown menu to right
   &.pull-right {
@@ -111,8 +111,8 @@
 // Right aligned dropdowns
 // ---------------------------
 .pull-right .dropdown-menu {
-  left: auto;
   right: 0;
+  left: auto;
 }
 
 // Allow for dropdowns to go bottom up (aka, dropup-menu)

less/forms.less

@@ -98,8 +98,8 @@ input[type="radio"] {
   *margin-top: 0; /* IE7 */
   line-height: normal;
   cursor: pointer;
-  .border-radius(0);
   border: 0 \9; /* IE9 and down */
+  .border-radius(0);
 }
 input[type="image"] {
   border: 0;
@@ -110,9 +110,9 @@ input[type="file"] {
   width: auto;
   padding: initial;
   line-height: initial;
-  border: initial;
   background-color: @inputBackground;
   background-color: initial;
+  border: initial;
   .box-shadow(none);
 }
 
@@ -172,8 +172,8 @@ input[type="hidden"] {
 // Indent the labels to position radios/checkboxes as hanging
 .radio,
 .checkbox {
-  overflow: auto; // clear the floating input if there is no label text
   padding-left: 18px;
+  overflow: auto; // clear the floating input if there is no label text
 }
 .radio input[type="radio"],
 .checkbox input[type="checkbox"] {
@@ -215,16 +215,16 @@ textarea {
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
   outline: 0;
   outline: thin dotted \9; /* IE6-9 */
+  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
 }
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus,
 select:focus {
-  .box-shadow(none); // override for file inputs
   .tab-focus();
+  .box-shadow(none); // override for file inputs
 }
 
 
@@ -274,9 +274,9 @@ textarea[disabled],
 input[readonly],
 select[readonly],
 textarea[readonly] {
+  cursor: not-allowed;
   background-color: @inputDisabledBackground;
   border-color: #ddd;
-  cursor: not-allowed;
 }
 
 
@@ -327,13 +327,12 @@ select:focus:required:invalid {
 
 // For text that needs to appear as an input but should not be an input
 .uneditable-input {
+  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
+  white-space: nowrap;
+  cursor: not-allowed;
   background-color: @inputBackground;
   border-color: #eee;
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
-  // prevent text from wrapping, but still cut it off like an input does
-  overflow: hidden;
-  white-space: nowrap;
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
@@ -389,8 +388,8 @@ select:focus:required:invalid {
   .add-on {
     display: inline-block;
     width: auto;
-    min-width: 16px;
     height: @baseLineHeight;
+    min-width: 16px;
     padding: 4px 5px;
     font-weight: normal;
     line-height: @baseLineHeight;
@@ -427,8 +426,8 @@ select:focus:required:invalid {
     .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
   }
   .uneditable-input {
-    border-left-color: #eee;
     border-right-color: #ccc;
+    border-left-color: #eee;
   }
   .add-on:last-child,
   .btn:last-child {
@@ -460,10 +459,10 @@ select:focus:required:invalid {
 // -----------
 
 .search-query {
-  padding-left: 14px;
   padding-right: 14px;
-  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
   padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
   margin-bottom: 0; // remove the default margin on all inputs
   .border-radius(14px);
 }
@@ -521,8 +520,8 @@ select:focus:required:invalid {
 .form-inline .radio input[type="radio"],
 .form-inline .checkbox input[type="checkbox"] {
   float: left;
-  margin-left: 0;
   margin-right: 3px;
+  margin-left: 0;
 }
 
 
@@ -555,11 +554,12 @@ legend + .control-group {
   }
   // Move over all input controls and content
   .controls {
-    margin-left: 160px;
-    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls
+    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
+    // don't inherit the margin of the parent, in this case .controls
     *display: inline-block;
-    *margin-left: 0;
     *padding-left: 20px;
+    margin-left: 160px;
+    *margin-left: 0;
     &:first-child {
       *padding-left: 160px;
     }

less/layouts.less

@@ -11,7 +11,7 @@
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
 .container-fluid {
-  padding-left: @gridGutterWidth;
   padding-right: @gridGutterWidth;
+  padding-left: @gridGutterWidth;
   .clearfix();
 }
\ No newline at end of file

less/mixins.less

@@ -102,11 +102,11 @@
 // -------------------------
 // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
 .hide-text {
-  border: 0;
   font: 0/0 a;
-  text-shadow: none;
   color: transparent;
+  text-shadow: none;
   background-color: transparent;
+  border: 0;
 }
 
 
@@ -152,9 +152,8 @@
 .input-block-level {
   display: block;
   width: 100%;
-  min-height: 28px; /* Make inputs at least the height of their button counterpart */
-  /* Makes inputs behave like true block-level elements */
-  .box-sizing(border-box);
+  min-height: 28px;        // Make inputs at least the height of their button counterpart
+  .box-sizing(border-box); // Makes inputs behave like true block-level elements
 }
 
 
@@ -292,6 +291,7 @@
 .user-select(@select) {
   -webkit-user-select: @select;
      -moz-user-select: @select;
+      -ms-user-select: @select;
        -o-user-select: @select;
           user-select: @select;
 }
@@ -418,18 +418,17 @@
 // -------------------------
 // Dividers (basically an hr) within dropdowns and nav lists
 .nav-divider() {
-  height: 1px;
-  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid @white;
-
   // IE7 needs a set width since we gave a height. Restricting just
   // to IE7 to keep the 1px left/right space in other browsers.
   // It is unclear where IE is getting the extra space that we need
   // to negative-margin away, but so it goes.
   *width: 100%;
+  height: 1px;
+  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
   *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid @white;
 }
 
 // Button backgrounds
@@ -437,8 +436,8 @@
 .buttonBackground(@startColor, @endColor) {
   // gradientBar will set the background to a pleasing blend of these, to support IE<=9
   .gradientBar(@startColor, @endColor);
-  .reset-filter();
   *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+  .reset-filter();
 
   // in these cases the gradient won't cover the background, so we override
   &:hover, &:active, &.active, &.disabled, &[disabled] {
@@ -504,8 +503,8 @@
 
 // Centered container element
 .container-fixed() {
-  margin-left: auto;
   margin-right: auto;
+  margin-left: auto;
   .clearfix();
 }
 

less/reset.less

@@ -76,9 +76,9 @@ sub {
 
 img {
   max-width: 100%; // Make images inherently responsive
+  vertical-align: middle;
   border: 0;
   -ms-interpolation-mode: bicubic;
-  vertical-align: middle;
 }
 
 // Forms
@@ -111,10 +111,10 @@ input[type="submit"] {
   -webkit-appearance: button; // Style clickable 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;
+  -webkit-appearance: textfield;
 }
 input[type="search"]::-webkit-search-decoration,
 input[type="search"]::-webkit-search-cancel-button {

less/sprites.less

@@ -19,13 +19,13 @@
   display: inline-block;
   width: 14px;
   height: 14px;
+  .ie7-restore-right-whitespace();
   line-height: 14px;
   vertical-align: text-top;
   background-image: url("@{iconSpritePath}");
   background-position: 14px 14px;
   background-repeat: no-repeat;
 
-  .ie7-restore-right-whitespace();
 }
 .icon-white {
   background-image: url("@{iconWhiteSpritePath}");

less/tables.less

@@ -9,9 +9,9 @@
 
 table {
   max-width: 100%;
+  background-color: @tableBackground;
   border-collapse: collapse;
   border-spacing: 0;
-  background-color: @tableBackground;
 }
 
 // BASELINE STYLES
@@ -69,9 +69,9 @@ table {
 
 .table-bordered {
   border: 1px solid @tableBorder;
-  border-left: 0;
   border-collapse: separate; // Done so we can round those corners!
   *border-collapse: collapsed; // IE7 can't round corners anyway
+  border-left: 0;
   .border-radius(4px);
   th,
   td {
@@ -93,28 +93,28 @@ table {
   thead:first-child tr:first-child th:first-child,
   tbody:first-child tr:first-child td:first-child {
     -webkit-border-top-left-radius: 4px;
-        -moz-border-radius-topleft: 4px;
             border-top-left-radius: 4px;
+        -moz-border-radius-topleft: 4px;
   }
   thead:first-child tr:first-child th:last-child,
   tbody:first-child tr:first-child td:last-child {
     -webkit-border-top-right-radius: 4px;
-        -moz-border-radius-topright: 4px;
             border-top-right-radius: 4px;
+        -moz-border-radius-topright: 4px;
   }
   // For first th or td in the first row in the first thead or tbody
   thead:last-child tr:last-child th:first-child,
   tbody:last-child tr:last-child td:first-child {
     .border-radius(0 0 0 4px);
     -webkit-border-bottom-left-radius: 4px;
-        -moz-border-radius-bottomleft: 4px;
             border-bottom-left-radius: 4px;
+        -moz-border-radius-bottomleft: 4px;
   }
   thead:last-child tr:last-child th:last-child,
   tbody:last-child tr:last-child td:last-child {
     -webkit-border-bottom-right-radius: 4px;
-        -moz-border-radius-bottomright: 4px;
             border-bottom-right-radius: 4px;
+        -moz-border-radius-bottomright: 4px;
   }
 }
 

less/type.less

@@ -52,8 +52,8 @@ h2 {
   }
 }
 h3 {
-  line-height: @baseLineHeight * 1.5;
   font-size: 18px;
+  line-height: @baseLineHeight * 1.5;
   small {
     font-size: 14px;
   }
@@ -135,11 +135,11 @@ dd {
 // Horizontal layout (like forms)
 .dl-horizontal {
   dt {
-    .text-overflow();
     float: left;
-    clear: left;
     width: 120px;
+    clear: left;
     text-align: right;
+    .text-overflow();
   }
   dd {
     margin-left: 130px;
@@ -170,8 +170,8 @@ em {
 
 // Abbreviations and acronyms
 abbr[title] {
-  border-bottom: 1px dotted #ddd;
   cursor: help;
+  border-bottom: 1px dotted #ddd;
 }
 abbr.initialism {
   font-size: 90%;
@@ -199,10 +199,10 @@ blockquote {
   // Float right with text-align: right
   &.pull-right {
     float: right;
-    padding-left: 0;
     padding-right: 15px;
-    border-left: 0;
+    padding-left: 0;
     border-right: 5px solid @grayLighter;
+    border-left: 0;
     p,
     small {
       text-align: right;
@@ -222,8 +222,8 @@ blockquote:after {
 address {
   display: block;
   margin-bottom: @baseLineHeight;
-  line-height: @baseLineHeight;
   font-style: normal;
+  line-height: @baseLineHeight;
 }
 
 // Misc