diff options
| author | Mark Otto <[email protected]> | 2012-02-16 22:34:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-16 22:34:30 -0800 |
| commit | 091622644a0c619e1afbb21041c141da30df76b7 (patch) | |
| tree | 85ee07a734b2c16223be6072a0d401031a0e9cc7 | |
| parent | 6f6adfb52fc2f6043f84ac4fab876592c00b2894 (diff) | |
| download | bootstrap-091622644a0c619e1afbb21041c141da30df76b7.tar.xz bootstrap-091622644a0c619e1afbb21041c141da30df76b7.zip | |
bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53322 -> 53357 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | less/code.less | 1 | ||||
| -rw-r--r-- | less/forms.less | 5 |
4 files changed, 12 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 4ef9191d6..622ad0117 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74d7308be..ed32b339f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -498,6 +498,7 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + word-wrap: break-word; } pre.prettyprint { margin-bottom: 18px; @@ -588,11 +589,16 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { /* IE7 */ line-height: normal; - border: 0; cursor: pointer; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + border: 0 \9; + /* IE9 and down */ + +} +input[type="image"] { + border: 0; } input[type="file"] { width: auto; diff --git a/less/code.less b/less/code.less index 35a8ae6b8..e2157d8ab 100644 --- a/less/code.less +++ b/less/code.less @@ -34,6 +34,7 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + word-wrap: break-word; // Make prettyprint styles more spaced out for readability &.prettyprint { diff --git a/less/forms.less b/less/forms.less index be9dbfaa9..0a5fa2b86 100644 --- a/less/forms.less +++ b/less/forms.less @@ -96,9 +96,12 @@ input[type="radio"] { margin: 3px 0; *margin-top: 0; /* IE7 */ line-height: normal; - border: 0; cursor: pointer; .border-radius(0); + border: 0 \9; /* IE9 and down */ +} +input[type="image"] { + border: 0; } // Reset the file input to browser defaults |