Merge branch '2.1.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
This commit is contained in:
Mark Otto
2012-10-01 23:41:00 -07:00
12 changed files with 1246 additions and 92 deletions

View File

@@ -151,7 +151,6 @@
.dropdown-submenu {
position: relative;
}
// Default dropdowns
.dropdown-submenu > .dropdown-menu {
top: 0;
@@ -195,6 +194,21 @@
border-left-color: @dropdownLinkColorHover;
}
// Left aligned submenus
.dropdown-submenu.pull-left {
// Undo the float
// Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
float: none;
// Positioning the submenu
> .dropdown-menu {
left: -100%;
margin-left: 10px;
-webkit-border-radius: 6px 0 6px 6px;
-moz-border-radius: 6px 0 6px 6px;
border-radius: 6px 0 6px 6px;
}
}
// Tweak nav headers
// -----------------

View File

@@ -334,6 +334,11 @@ textarea[class*="span"],
.controls-row [class*="span"] {
float: left;
}
// Explicity set top padding on all checkboxes/radios, not just first-child
.controls-row .checkbox[class*="span"],
.controls-row .radio[class*="span"] {
padding-top: 5px;
}

View File

@@ -6,6 +6,8 @@
// Base classes
.label,
.badge {
display: inline-block;
padding: 2px 4px;
font-size: @baseFontSize * .846;
font-weight: bold;
line-height: 14px; // ensure proper line-height if floated
@@ -17,11 +19,11 @@
}
// Set unique padding and border-radii
.label {
padding: 1px 4px 2px;
border-radius: 3px;
}
.badge {
padding: 1px 9px 2px;
padding-left: 9px;
padding-right: 9px;
border-radius: 9px;
}

View File

@@ -261,6 +261,7 @@
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
-o-transform: skew(@x, @y);
transform: skew(@x, @y);
-webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
}
.translate3d(@x, @y, @z) {
-webkit-transform: translate3d(@x, @y, @z);

View File

@@ -83,7 +83,8 @@
right: 20px;
width: auto;
margin: 0;
&.fade.in { top: auto; }
&.fade { top: -100px; }
&.fade.in { top: 20px; }
}
}

View File

@@ -178,8 +178,6 @@ table [class*=span] {
margin-left: 0; // undo default grid column styles
}
// TABLE BACKGROUNDS
// -----------------
// Exact selectors below required to override .table-striped