0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00

Merge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base

This commit is contained in:
Mark Otto 2012-01-27 09:40:04 -08:00
commit 97546adc90
4 changed files with 31 additions and 2 deletions

View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 08:21:21 PST 2012 * Date: Fri Jan 27 12:16:22 EST 2012
*/ */
article, article,
aside, aside,
@ -887,6 +887,12 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
} }
.input-append input:first-child {
*margin-left: -160px;
}
.input-append input:first-child + .add-on {
*margin-left: -21px;
}
.search-query { .search-query {
padding-left: 14px; padding-left: 14px;
padding-right: 14px; padding-right: 14px;
@ -972,6 +978,7 @@ table {
.table-bordered { .table-bordered {
border: 1px solid #ddd; border: 1px solid #ddd;
border-collapse: separate; border-collapse: separate;
*border-collapse: collapsed;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
@ -2448,6 +2455,8 @@ table .span12 {
.btn { .btn {
display: inline-block; display: inline-block;
padding: 4px 10px 4px; padding: 4px 10px 4px;
*padding: 2px 10px;
*margin-left: 4px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #333333; color: #333333;
@ -2470,6 +2479,9 @@ table .span12 {
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
cursor: pointer; cursor: pointer;
} }
.btn:first-child {
*margin-left: 0;
}
.btn:hover { .btn:hover {
color: #333333; color: #333333;
text-decoration: none; text-decoration: none;

View File

@ -67,6 +67,13 @@
// Button Base // Button Base
display: inline-block; display: inline-block;
padding: 4px 10px 4px; padding: 4px 10px 4px;
*padding: 2px 10px;
// IE7 likes to collapse the whitespace before the button, so bring it back...
*margin-left: 4px;
&:first-child {
// ...but not before the first button
*margin-left: 0;
}
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: @baseLineHeight; line-height: @baseLineHeight;
color: @grayDark; color: @grayDark;

View File

@ -440,6 +440,15 @@ select:focus:required:invalid {
margin-left: -1px; margin-left: -1px;
.border-radius(0 3px 3px 0); .border-radius(0 3px 3px 0);
} }
input:first-child {
// In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input
// inherit the sum of its ancestors' margins.
*margin-left: -160px;
&+.add-on {
*margin-left: -21px;
}
}
} }

View File

@ -64,6 +64,7 @@ table {
.table-bordered { .table-bordered {
border: 1px solid #ddd; border: 1px solid #ddd;
border-collapse: separate; // Done so we can round those corners! border-collapse: separate; // Done so we can round those corners!
*border-collapse: collapsed; // IE7 can't round corners anyway
.border-radius(4px); .border-radius(4px);
th + th, th + th,
td + td, td + td,