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

Conflicts:
	bootstrap.css
	bootstrap.min.css

diff --cc bootstrap.css
index 87e12fca0b6d6602262864694fe02101d6c886cc,271c35afc9d168a7c8e358992df00a167f9a5316..e7c0a732f21ad8556bf44f75768d15b46571d96a
--- 1/bootstrap.css
--- 2/bootstrap.css
+++ b/bootstrap.css
@@@ -6,11 -6,8 +6,8 @@@
   * 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 Nov 29 22:34:51 PST 2011
 - * Date: Tue Nov 29 11:11:41 CST 2011
++ * Date: Tue Nov 29 22:35:45 PST 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).
-  * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
  html, body {
    margin: 0;
    padding: 0;
@@@ -999,32 -980,33 +980,28 @@@ form .clearfix.success .input-prepend .
  .horizontal-form .form-actions {
    padding-left: 150px;
  }
- /*
-  * Tables.less
-  * Tables for, you guessed it, tabular data
-  * ---------------------------------------- */
  table {
    width: 100%;
 -  padding: 0;
    margin-bottom: 18px;
 -  font-size: 13px;
 -  border-collapse: collapse;
  }
 -table th, table td {
 -  padding: 10px 10px 9px;
 +th, td {
 +  padding: 8px;
    line-height: 18px;
    text-align: left;
 +  border-bottom: 1px solid #ddd;
  }
 -table th {
 -  padding-top: 9px;
 +th {
    font-weight: bold;
 -  vertical-align: middle;
 +  vertical-align: bottom;
  }
 -table td {
 +td {
    vertical-align: top;
 -  border-top: 1px solid #ddd;
  }
 -table tbody th {
 -  border-top: 1px solid #ddd;
 -  vertical-align: top;
 +tbody tr:last-child th, tbody tr:last-child td {
 +  border-bottom: 0;
  }
  .condensed-table th, .condensed-table td {
 -  padding: 5px 5px 4px;
 +  padding: 4px 5px;
  }
  .bordered-table {
    border: 1px solid #ddd;
@@@ -1062,140 -1044,137 +1039,138 @@@
  .striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th {
    background-color: #f9f9f9;
  }
 -.striped-table tbody tr:hover td, .striped-table tbody tr:hover th {
 -  background-color: #f5f5f5;
 -}
 -table .header {
 -  cursor: pointer;
 -}
 -table .header:after {
 -  float: right;
 -  margin-top: 7px;
 -  border-width: 0 4px 4px;
 -  border-style: solid;
 -  border-color: #000 transparent;
 -  content: "";
 -  visibility: hidden;
 -}
 -table .headerSortUp, table .headerSortDown {
 -  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
 -  background-color: rgba(141, 192, 219, 0.25);
 -}
 -table .header:hover:after {
 -  visibility: visible;
 -}
 -table .headerSortDown:after, table .headerSortDown:hover:after {
 -  visibility: visible;
 -  filter: alpha(opacity=60);
 -  -moz-opacity: 0.6;
 -  opacity: 0.6;
 -}
 -table .headerSortUp:after {
 -  border-bottom: none;
 -  border-left: 4px solid transparent;
 -  border-right: 4px solid transparent;
 -  border-top: 4px solid #000;
 -  visibility: visible;
 -  -webkit-box-shadow: none;
 -  -moz-box-shadow: none;
 -  box-shadow: none;
 -  filter: alpha(opacity=60);
 -  -moz-opacity: 0.6;
 -  opacity: 0.6;
 -}
 -table .blue {
 -  color: #049cdb;
 -  border-bottom-color: #049cdb;
 -}
 -table .headerSortUp.blue, table .headerSortDown.blue {
 -  background-color: #ade6fe;
 -}
 -table .green {
 -  color: #46a546;
 -  border-bottom-color: #46a546;
 -}
 -table .headerSortUp.green, table .headerSortDown.green {
 -  background-color: #cdeacd;
 -}
 -table .red {
 -  color: #9d261d;
 -  border-bottom-color: #9d261d;
 -}
 -table .headerSortUp.red, table .headerSortDown.red {
 -  background-color: #f4c8c5;
 -}
 -table .yellow {
 -  color: #ffc40d;
 -  border-bottom-color: #ffc40d;
 -}
 -table .headerSortUp.yellow, table .headerSortDown.yellow {
 -  background-color: #fff6d9;
 -}
 -table .orange {
 -  color: #f89406;
 -  border-bottom-color: #f89406;
 -}
 -table .headerSortUp.orange, table .headerSortDown.orange {
 -  background-color: #fee9cc;
 -}
 -table .purple {
 -  color: #7a43b6;
 -  border-bottom-color: #7a43b6;
 +/*
 +// ----------------
 +
 +// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border
 +.tableColumns(@columnSpan: 1) {
 +  width: ((@gridColumnWidth - 20) * @columnSpan) + ((@gridColumnWidth - 20) * (@columnSpan - 1));
  }
 -table .headerSortUp.purple, table .headerSortDown.purple {
 -  background-color: #e2d5f0;
 +table {
 +  // Default columns
 +  .span1     { .tableColumns(1); }
 +  .span2     { .tableColumns(2); }
 +  .span3     { .tableColumns(3); }
 +  .span4     { .tableColumns(4); }
 +  .span5     { .tableColumns(5); }
 +  .span6     { .tableColumns(6); }
 +  .span7     { .tableColumns(7); }
 +  .span8     { .tableColumns(8); }
 +  .span9     { .tableColumns(9); }
 +  .span10    { .tableColumns(10); }
 +  .span11    { .tableColumns(11); }
 +  .span12    { .tableColumns(12); }
 +  .span13    { .tableColumns(13); }
 +  .span14    { .tableColumns(14); }
 +  .span15    { .tableColumns(15); }
 +  .span16    { .tableColumns(16); }
  }
- }*//* Patterns.less
-  * Repeatable UI elements outside the base styles provided from the scaffolding
-  * ---------------------------------------------------------------------------- */
 +
 +
 +// TABLESORTER
 +// -----------
 +
 +table {
 +  // Tablesorting styles w/ jQuery plugin
 +  .header {
 +    cursor: pointer;
 +    &:after {
 +      float: right;
 +      margin-top: 7px;
 +      border-width: 0 4px 4px;
 +      border-style: solid;
 +      border-color: #000 transparent;
 +      content: "";
 +      visibility: hidden;
 +    }
 +  }
 +  // Style the sorted column headers (THs)
 +  .headerSortUp,
 +  .headerSortDown {
 +    text-shadow: 0 1px 1px rgba(255,255,255,.75);
 +    background-color: rgba(141,192,219,.25);
 +  }
 +  // Style the ascending (reverse alphabetical) column header
 +  .header:hover {
 +    &:after {
 +      visibility: visible;
 +    }
 +  }
 +  // Style the descending (alphabetical) column header
 +  .headerSortDown,
 +  .headerSortDown:hover {
 +    &:after {
 +      visibility: visible;
 +      .opacity(60);
 +    }
 +  }
 +  // Style the ascending (reverse alphabetical) column header
 +  .headerSortUp {
 +    &:after {
 +      border-bottom: none;
 +      border-left: 4px solid transparent;
 +      border-right: 4px solid transparent;
 +      border-top: 4px solid #000;
 +      visibility:visible;
 +      .box-shadow(none); //can't add boxshadow to downward facing arrow :(
 +      .opacity(60);
 +    }
 +  }
 +  // Blue Table Headings
 +  .blue {
 +    color: @blue;
 +    border-bottom-color: @blue;
 +  }
 +  .headerSortUp.blue,
 +  .headerSortDown.blue {
 +    background-color: lighten(@blue, 40%);
 +  }
 +  // Green Table Headings
 +  .green {
 +    color: @green;
 +    border-bottom-color: @green;
 +  }
 +  .headerSortUp.green,
 +  .headerSortDown.green {
 +    background-color: lighten(@green, 40%);
 +  }
 +  // Red Table Headings
 +  .red {
 +    color: @red;
 +    border-bottom-color: @red;
 +  }
 +  .headerSortUp.red,
 +  .headerSortDown.red {
 +    background-color: lighten(@red, 50%);
 +  }
 +  // Yellow Table Headings
 +  .yellow {
 +    color: @yellow;
 +    border-bottom-color: @yellow;
 +  }
 +  .headerSortUp.yellow,
 +  .headerSortDown.yellow {
 +    background-color: lighten(@yellow, 40%);
 +  }
 +  // Orange Table Headings
 +  .orange {
 +    color: @orange;
 +    border-bottom-color: @orange;
 +  }
 +  .headerSortUp.orange,
 +  .headerSortDown.orange {
 +    background-color: lighten(@orange, 40%);
 +  }
 +  // Purple Table Headings
 +  .purple {
 +    color: @purple;
 +    border-bottom-color: @purple;
 +  }
 +  .headerSortUp.purple,
 +  .headerSortDown.purple {
 +    background-color: lighten(@purple, 40%);
 +  }
++}*/
  .navbar {
    height: 40px;
    overflow: visible;

diff --cc bootstrap.min.css
Simple merge

diff --cc docs/assets/css/docs.css
index 6c57fddabdc639553a0ef481c0666e78b26ff676,0873d443f6f017ba9dc5244221b5c66acfd3dda3..ec3cd83cb28b69ada8d7f852d17ad8cdb0813b33
--- 1/docs/assets/css/docs.css
--- 2/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@@ -492,3 -473,19 +499,19 @@@ h2 + table 
    }
  }
  
 -}
+ #accordion dt a{
+   display:block;
+   padding: 9px 15px;
+   line-height: 1;
+   background-color: whiteSmoke;
+   border: 1px solid #EEE;
+   border-top-color: #fff;
+ }
+ 
+ #accordion dt:first-child a {
+   border-top-color:#eee;
+ }
+ 
+ #accordion dd p {
+   padding: 10px;
++}

diff --cc docs/base-css.html
Simple merge

diff --cc lib/tables.less
index c8cda1cf9cb78a319a7fa326a49ee7456a60b0c2,22a319918517a457091755a7f357e0b406005551..524f959f06ed542070a183bb7dc06364dc3b70bc
--- 1/lib/tables.less
--- 2/lib/tables.less
+++ b/lib/tables.less
@@@ -1,10 -1,9 +1,10 @@@
- /*
-  * Tables.less
-  * Tables for, you guessed it, tabular data
-  * ---------------------------------------- */
+ //
+ // Tables.less
+ // Tables for, you guessed it, tabular data
+ // ----------------------------------------
  
  
 +
  // BASELINE STYLES
  // ---------------
  
@@@ -223,4 -225,4 +223,4 @@@ table 
    .headerSortDown.purple {
      background-color: lighten(@purple, 40%);
    }
- }*/
 -}
++}*/