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

5 files changed, 53 insertions, 11 deletions

diff --git a/lib/forms.less b/lib/forms.less
index 99177138a..0440e3c67 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -26,7 +26,7 @@ fieldset {
 }
 
 // Parent element that clears floats and wraps labels and fields together
-.clearfix {
+form .clearfix {
   margin-bottom: @baseline;
 }
 
diff --git a/lib/patterns.less b/lib/patterns.less
index ce309a451..b2c0d1365 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -62,6 +62,10 @@
     position: relative;
     .opacity(100);
   }
+  // Todo: remove from v2.0 when ready, added for legacy
+  form.pull-right {
+    float: right;
+  }
   input {
     background-color: #444;
     background-color: rgba(255,255,255,.3);
@@ -398,6 +402,32 @@ a.menu:after,
 }
 
 
+// BREADCRUMBS
+// -----------
+
+.breadcrumb {
+  margin: 0 0 @baseline;
+  padding: 7px 14px;
+  #gradient > .vertical(#ffffff, #f5f5f5);
+  border: 1px solid #ddd;
+  .border-radius(3px);
+  .box-shadow(inset 0 1px 0 #fff);
+  li {
+    display: inline;
+    text-shadow: 0 1px 0 #fff;
+  }
+  .divider {
+    padding: 0 5px;
+    color: @grayLight;
+  }
+  a {
+  }
+  .active a {
+    color: @grayDark;
+  }
+}
+
+
 // PAGE HEADERS
 // ------------
 
diff --git a/lib/preboot.less b/lib/preboot.less
index 3f44e376b..dffeb64bf 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -121,7 +121,7 @@
 }
 
 // Grid System
-.fixed-container {
+.fixed-container() {
   width: @siteWidth;
   margin-left: auto;
   margin-right: auto;
@@ -133,6 +133,17 @@
 .offset(@columnOffset: 1) {
   margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
 }
+// Necessary grid styles for every column to make them appear next to each other horizontally
+.gridColumn() {
+  display: inline;
+  float: left;
+  margin-left: @gridGutterWidth;
+}
+// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
+.makeColumn(@columnSpan: 1) {
+  .gridColumn();
+  .columns(@columnSpan);
+}
 
 // Border Radius
 .border-radius(@radius: 5px) {
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 148e4e0d5..88f1139ef 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -13,10 +13,8 @@
 
   // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
   // Credit to @dhg for the idea
-  [class^="span"] {
-    display: inline;
-    float: left;
-    margin-left: @gridGutterWidth;
+  [class*="span"] {
+    .gridColumn();
   }
 
   // Default columns
diff --git a/lib/tables.less b/lib/tables.less
index d1af37de8..4fff7bd64 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -11,20 +11,23 @@ table {
   width: 100%;
   margin-bottom: @baseline;
   padding: 0;
-  border-collapse: separate;
-  font-size: 13px;
+  border-collapse: collapse;
+  font-size: @basefont;
   th, td {
     padding: 10px 10px 9px;
-    line-height: @baseline * .75;
+    line-height: @baseline;
     text-align: left;
-    vertical-align: middle;
-    border-bottom: 1px solid #ddd;
+    border: 1px solid #ddd;
   }
   th {
     padding-top: 9px;
     font-weight: bold;
+    vertical-align: middle;
     border-bottom-width: 2px;
   }
+  td {
+    vertical-align: top;
+  }
 }