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

Conflicts:
	bootstrap.css
	bootstrap.min.css

10 files changed, 44 insertions, 42 deletions

diff --git a/lib/forms.less b/lib/forms.less
index 845eec185..5de55e727 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -1,7 +1,6 @@
-/* Forms.less
- * Base styles for various input types, form layouts, and states
- * ------------------------------------------------------------- */
-
+// Forms.less
+// Base styles for various input types, form layouts, and states
+// -------------------------------------------------------------
 
 
 // GENERAL STYLES
@@ -146,7 +145,7 @@ select:focus {
 .formColumns(@columnSpan: 1) {
   display: inline-block;
   float: none;
-  width: ((@gridColumnWidth - 10) * @columnSpan) + ((@gridColumnWidth - 10) * (@columnSpan - 1));
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
   margin-left: 0;
 }
 input,
diff --git a/lib/mixins.less b/lib/mixins.less
index d77ecf621..0effdfa37 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -1,6 +1,6 @@
-/* Mixins.less
- * Snippets of reusable CSS to develop faster and keep code readable
- * ----------------------------------------------------------------- */
+// Mixins.less
+// Snippets of reusable CSS to develop faster and keep code readable
+// -----------------------------------------------------------------
 
 
 // Clearfix for clearing floats like a boss h5bp.com/q
diff --git a/lib/patterns.less b/lib/patterns.less
index 2fcc4f2b3..15c3c9c06 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -1,6 +1,6 @@
-/* Patterns.less
- * Repeatable UI elements outside the base styles provided from the scaffolding
- * ---------------------------------------------------------------------------- */
+// Patterns.less
+// Repeatable UI elements outside the base styles provided from the scaffolding
+// ----------------------------------------------------------------------------
 
 
 // NAVBAR (FIXED AND STATIC)
@@ -415,6 +415,7 @@ footer {
   .transition(.1s linear all);
 
   // Active and Disabled states
+  &.active,
   &:active {
     @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);
@@ -630,14 +631,6 @@ input[type=submit].btn {
 }
 
 
-
-
-
-
-
-
-
-
 // PATTERN ANIMATIONS
 // ------------------
 
@@ -649,6 +642,14 @@ input[type=submit].btn {
   }
 }
 
+.collapse {
+  .transition(height .35s ease);
+  position:relative;
+  overflow:hidden;
+  height: 0;
+  &.in { height: auto; }
+}
+
 
 // LABELS
 // ------
diff --git a/lib/reset.less b/lib/reset.less
index 8bff57335..c95c7b04c 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -1,6 +1,8 @@
-/* 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).
- * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
+// 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).
+// ------------------------------------------------------------------------
 
 
 // ERIC MEYER RESET
diff --git a/lib/responsive.less b/lib/responsive.less
index 75c33b1a8..f63f90c98 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -1,6 +1,6 @@
-/* Responsive.less
- * For phone and tablet devices
- * ------------------------------------------------------------- */
+// Responsive.less
+// For phone and tablet devices
+// -------------------------------------------------------------
 
 
 // UP TO LANDSCAPE PHONE
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 179ef2638..3e231aae5 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -1,7 +1,7 @@
-/*
- * Scaffolding
- * Basic and global styles for generating a grid system, structural layout, and page templates
- * ------------------------------------------------------------------------------------------- */
+//
+// Scaffolding
+// Basic and global styles for generating a grid system, structural layout, and page templates
+// -------------------------------------------------------------------------------------------
 
 
 // STRUCTURAL LAYOUT
diff --git a/lib/tables.less b/lib/tables.less
index c8cda1cf9..524f959f0 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -1,7 +1,7 @@
-/*
- * Tables.less
- * Tables for, you guessed it, tabular data
- * ---------------------------------------- */
+//
+// Tables.less
+// Tables for, you guessed it, tabular data
+// ----------------------------------------
 
 
 
@@ -223,4 +223,4 @@ table {
   .headerSortDown.purple {
     background-color: lighten(@purple, 40%);
   }
-}*/
\ No newline at end of file
+}*/
diff --git a/lib/twipsy.less b/lib/twipsy.less
index 4193eda5f..3fa21fa01 100644
--- a/lib/twipsy.less
+++ b/lib/twipsy.less
@@ -8,8 +8,8 @@
   visibility: visible;
   padding: 5px;
   font-size: 11px;
-  .opacity(80);
-  &.fade.in {
+  .opacity(0);
+  &.in {
     .opacity(80);
   }
   &.above .twipsy-arrow   { #popoverArrow > .above(); }
diff --git a/lib/type.less b/lib/type.less
index 8e25fd9c5..407a20ec2 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -1,6 +1,6 @@
-/* Typography.less
- * Headings, body text, lists, code, and more for a versatile and durable typography system
- * ---------------------------------------------------------------------------------------- */
+// Typography.less
+// Headings, body text, lists, code, and more for a versatile and durable typography system
+// ----------------------------------------------------------------------------------------
 
 
 // BODY TEXT
diff --git a/lib/variables.less b/lib/variables.less
index 92d09de70..caa9c0f60 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -1,6 +1,6 @@
-/* Variables.less
- * Variables to customize the look and feel of Bootstrap
- * ----------------------------------------------------- */
+// Variables.less
+// Variables to customize the look and feel of Bootstrap
+// -----------------------------------------------------
 
 
 // LINK COLORS