aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-09 17:29:07 -0700
committerMark Otto <[email protected]>2013-05-09 17:29:07 -0700
commitdbbd48f7bcc476d7e7f4780d6b342f1bce581ff0 (patch)
tree9ef2ccabf33d4a772fc50324d98f002a297801d9
parent90e4ff73d25e426cf19bb84392510f78e2cd2fd8 (diff)
downloadbootstrap-dbbd48f7bcc476d7e7f4780d6b342f1bce581ff0.tar.xz
bootstrap-dbbd48f7bcc476d7e7f4780d6b342f1bce581ff0.zip
remove duplicate text scaling
-rw-r--r--docs/assets/css/bootstrap.css7
-rw-r--r--less/scaffolding.less8
2 files changed, 0 insertions, 15 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 53777491a..8bf8530e1 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -280,13 +280,6 @@ html {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
-@media screen and (max-device-width: 480px) {
- html {
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
- }
-}
-
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 6781a9582..8c6a5af6c 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -21,14 +21,6 @@ html {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
-// Disable iOS/WinMobile font size changes
-@media screen and (max-device-width: @screen-phone) {
- html {
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
- }
-}
-
body {
font-family: @font-family-base;
font-size: @font-size-base;