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

1 files changed, 24 insertions, 21 deletions

diff --git a/bootstrap.css b/bootstrap.css
index a7adebc69..94dbb099b 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Sep 15 23:09:33 PDT 2011
+ * Date: Fri Sep 16 10:51:22 PDT 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).
@@ -226,19 +226,10 @@ body {
   width: 220px;
 }
 .container-fluid > .content {
+  float: left;
   min-width: 700px;
   max-width: 1180px;
-  margin-left: 240px;
-  zoom: 1;
-}
-.container-fluid > .content:before, .container-fluid > .content:after {
-  display: table;
-  content: "";
-  zoom: 1;
-  *display: inline;
-}
-.container-fluid > .content:after {
-  clear: both;
+  margin-left: 20px;
 }
 .hide {
   display: none;
@@ -686,6 +677,9 @@ select, input[type=file] {
   /* For IE7, add top margin to align select with labels */
 
 }
+select[multiple] {
+  height: inherit;
+}
 textarea {
   height: auto;
 }
@@ -1092,6 +1086,10 @@ table {
   width: 100%;
   margin-bottom: 18px;
   padding: 0;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  /* IE7, collapse table to remove spacing */
+
   font-size: 13px;
   border: 1px solid #ddd;
   -webkit-border-radius: 4px;
@@ -1591,24 +1589,24 @@ a.menu:after, .dropdown-toggle:after {
   top: 1px;
 }
 .tabs > li > a {
-  margin-right: 2px;
   padding: 0 15px;
-  line-height: 35px;
+  margin-right: 2px;
+  line-height: 36px;
+  border: 1px solid transparent;
   -webkit-border-radius: 4px 4px 0 0;
   -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
 .tabs > li > a:hover {
-  background-color: #eee;
-  border-bottom: 1px solid #ddd;
   text-decoration: none;
+  background-color: #eee;
+  border-color: #eee #eee #ddd;
 }
 .tabs > li.active > a {
+  color: #808080;
   background-color: #ffffff;
-  padding: 0 14px;
   border: 1px solid #ddd;
-  border-bottom: 0;
-  color: #808080;
+  border-bottom-color: transparent;
 }
 .tabs .menu-dropdown, .tabs .dropdown-menu {
   top: 35px;
@@ -1940,6 +1938,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
 }
+.alert-message .close {
+  *margin-top: 3px;
+  /* IE7 spacing */
+
+}
 .alert-message h5 {
   line-height: 18px;
 }
@@ -2253,8 +2256,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   height: 0;
 }
 .popover .inner {
-  background: #333;
-  background: rgba(0, 0, 0, 0.8);
+  background-color: #000000;
+  background-color: rgba(0, 0, 0, 0.8);
   padding: 3px;
   overflow: hidden;
   width: 280px;