jenkins-bot has submitted this change and it was merged.
Change subject: Drop iphone device stylesheet support
......................................................................
Drop iphone device stylesheet support
Search placeholder displays fine in iOS 6
Not clear which version it was specific too and unable to find
phone < iOS 6
Change-Id: I9057c07bc35f02f31a7ae42f039c964ac93a7d85
---
M includes/DeviceDetection.php
M less/common/mf-typography.less
M stylesheets/common/mf-typography.css
D stylesheets/devices/iphone.css
M tests/DeviceDetectionTest.php
5 files changed, 6 insertions(+), 10 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DeviceDetection.php b/includes/DeviceDetection.php
index 7a2d07b..81e0321 100644
--- a/includes/DeviceDetection.php
+++ b/includes/DeviceDetection.php
@@ -217,7 +217,6 @@
),
'iphone' => array (
'view_format' => 'html',
- 'css_file_name' => 'iphone',
),
'kindle' => array (
'view_format' => 'html',
diff --git a/less/common/mf-typography.less b/less/common/mf-typography.less
index 02092c9..bcee305 100644
--- a/less/common/mf-typography.less
+++ b/less/common/mf-typography.less
@@ -1,6 +1,8 @@
@import "../mf-variables.less";
html {
+ /* prevent font scaling in landscape in Safari */
+ -webkit-text-size-adjust: none;
font-size: 100% * @fontScalingFactor; /* default browser size is 16px
(12pt - our @baseFontSize) */
}
diff --git a/stylesheets/common/mf-typography.css
b/stylesheets/common/mf-typography.css
index 0ae6219..1fa3078 100644
--- a/stylesheets/common/mf-typography.css
+++ b/stylesheets/common/mf-typography.css
@@ -1,4 +1,7 @@
html {
+ /* prevent font scaling in landscape in Safari */
+
+ -webkit-text-size-adjust: none;
font-size: 90%;
/* default browser size is 16px (12pt - our @baseFontSize) */
diff --git a/stylesheets/devices/iphone.css b/stylesheets/devices/iphone.css
deleted file mode 100644
index 222d395..0000000
--- a/stylesheets/devices/iphone.css
+++ /dev/null
@@ -1,8 +0,0 @@
-html {
- /* prevent font scaling in landscape in Safari */
- -webkit-text-size-adjust: none;
-}
-
-#searchInput {
- line-height: normal; /* placeholder displays incorrectly on iphones */
-}
diff --git a/tests/DeviceDetectionTest.php b/tests/DeviceDetectionTest.php
index d33965a..cd8a25d 100644
--- a/tests/DeviceDetectionTest.php
+++ b/tests/DeviceDetectionTest.php
@@ -86,7 +86,7 @@
array( 'palm_pre', '' ),
array( 'generic', '' ),
array( 'ie', '' ),
- array( 'iphone', 'mobile.device.iphone' ),
+ array( 'iphone', '' ),
array( 'kindle', '' ),
array( 'blackberry', '' ),
array( 'nokia', '' ),
--
To view, visit https://gerrit.wikimedia.org/r/72138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9057c07bc35f02f31a7ae42f039c964ac93a7d85
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
