jenkins-bot has submitted this change and it was merged.
Change subject: Device cleanup
......................................................................
Device cleanup
Remove empty device stylesheets
Move nokia css rule into more generic rule in ui.css
Change-Id: I1a5b2922998f7f4ed508814d17b97ee1f0da7958
---
M includes/DeviceDetection.php
M less/common/ui.less
M stylesheets/common/ui.css
D stylesheets/devices/android.css
D stylesheets/devices/nokia.css
D stylesheets/devices/palm_pre.css
D stylesheets/devices/webkit.css
M tests/DeviceDetectionTest.php
8 files changed, 5 insertions(+), 12 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DeviceDetection.php b/includes/DeviceDetection.php
index 6497a2c..981d93a 100644
--- a/includes/DeviceDetection.php
+++ b/includes/DeviceDetection.php
@@ -229,7 +229,6 @@
),
'nokia' => array (
'view_format' => 'html',
- 'css_file_name' => 'nokia',
),
'operamini' => array (
'view_format' => 'html',
diff --git a/less/common/ui.less b/less/common/ui.less
index 258a0f7..19cfeb8 100644
--- a/less/common/ui.less
+++ b/less/common/ui.less
@@ -69,7 +69,8 @@
padding: 0 0 0 5px;
width: 100%;
height: @headerElementHeight;
- background-color: white; /* remove fennec default background */
+ // FIXME: unable to check but the important may not be needed for Nokia
S60;
+ background-color: white !important; /* remove fennec default background
also see bug 36490 */
.box-sizing( border-box );
&::-webkit-search-cancel-button {
-webkit-appearance: none;
diff --git a/stylesheets/common/ui.css b/stylesheets/common/ui.css
index c55c85a..b7d79fb 100644
--- a/stylesheets/common/ui.css
+++ b/stylesheets/common/ui.css
@@ -410,8 +410,8 @@
padding: 0 0 0 5px;
width: 100%;
height: 30px;
- background-color: white;
- /* remove fennec default background */
+ background-color: white !important;
+ /* remove fennec default background also see bug 36490 */
-moz-box-sizing: border-box;
-o-box-sizing: border-box;
diff --git a/stylesheets/devices/android.css b/stylesheets/devices/android.css
deleted file mode 100644
index 3a2916c..0000000
--- a/stylesheets/devices/android.css
+++ /dev/null
@@ -1 +0,0 @@
-/* empty until further notice */
diff --git a/stylesheets/devices/nokia.css b/stylesheets/devices/nokia.css
deleted file mode 100644
index 90ac38d..0000000
--- a/stylesheets/devices/nokia.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* empty */
-#searchInput {
- background-color: white !important; /* see bug 36490 */
-}
diff --git a/stylesheets/devices/palm_pre.css b/stylesheets/devices/palm_pre.css
deleted file mode 100644
index 40a8c17..0000000
--- a/stylesheets/devices/palm_pre.css
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
diff --git a/stylesheets/devices/webkit.css b/stylesheets/devices/webkit.css
deleted file mode 100644
index 3a2916c..0000000
--- a/stylesheets/devices/webkit.css
+++ /dev/null
@@ -1 +0,0 @@
-/* empty until further notice */
diff --git a/tests/DeviceDetectionTest.php b/tests/DeviceDetectionTest.php
index b7b1d11..eba0f9b 100644
--- a/tests/DeviceDetectionTest.php
+++ b/tests/DeviceDetectionTest.php
@@ -89,7 +89,7 @@
array( 'iphone', 'mobile.device.iphone' ),
array( 'kindle', 'mobile.device.kindle' ),
array( 'blackberry', 'mobile.device.blackberry' ),
- array( 'nokia', 'mobile.device.nokia' ),
+ array( 'nokia', '' ),
array( 'wml', '' )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/72127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a5b2922998f7f4ed508814d17b97ee1f0da7958
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
