mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-11 08:04:59 +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:
Binary file not shown.
8
docs/assets/css/bootstrap.css
vendored
8
docs/assets/css/bootstrap.css
vendored
@@ -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;
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user