1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 00:24:03 +02:00

bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE

This commit is contained in:
Mark Otto
2012-02-16 22:34:30 -08:00
parent 6f6adfb52f
commit 091622644a
4 changed files with 12 additions and 2 deletions

Binary file not shown.

View File

@@ -498,6 +498,7 @@ pre {
white-space: pre; white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
word-wrap: break-word;
} }
pre.prettyprint { pre.prettyprint {
margin-bottom: 18px; margin-bottom: 18px;
@@ -588,11 +589,16 @@ input[type="image"], input[type="checkbox"], input[type="radio"] {
/* IE7 */ /* IE7 */
line-height: normal; line-height: normal;
border: 0;
cursor: pointer; cursor: pointer;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
border: 0 \9;
/* IE9 and down */
}
input[type="image"] {
border: 0;
} }
input[type="file"] { input[type="file"] {
width: auto; width: auto;

View File

@@ -34,6 +34,7 @@ pre {
white-space: pre; white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
word-wrap: break-word;
// Make prettyprint styles more spaced out for readability // Make prettyprint styles more spaced out for readability
&.prettyprint { &.prettyprint {

View File

@@ -96,9 +96,12 @@ input[type="radio"] {
margin: 3px 0; margin: 3px 0;
*margin-top: 0; /* IE7 */ *margin-top: 0; /* IE7 */
line-height: normal; line-height: normal;
border: 0;
cursor: pointer; cursor: pointer;
.border-radius(0); .border-radius(0);
border: 0 \9; /* IE9 and down */
}
input[type="image"] {
border: 0;
} }
// Reset the file input to browser defaults // Reset the file input to browser defaults