jenkins-bot has submitted this change and it was merged.

Change subject: Integrate ext.uls.nojs into ext.uls.pt
......................................................................


Integrate ext.uls.nojs into ext.uls.pt

The CSS hiding for non-JavaScript clients is only necessary when the buttons
get added.

Change-Id: I6e43e39d29c093a19f3e8355d657f162f9a62736
---
M UniversalLanguageSelector.hooks.php
M extension.json
D resources/css/ext.uls.nojs.css
M resources/css/ext.uls.pt.less
4 files changed, 5 insertions(+), 13 deletions(-)

Approvals:
  Nikerabbit: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index a56d498..fed4065 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -105,9 +105,6 @@
        public static function addModules( $out, $skin ) {
                global $wgULSPosition, $wgULSGeoService, $wgULSEventLogging;
 
-               // Load the style for users without JS, to hide the useless 
links
-               $out->addModuleStyles( 'ext.uls.nojs' );
-
                // If EventLogging integration is enabled, load the schema 
module
                // and the event logging functions module
                if ( $wgULSEventLogging ) {
diff --git a/extension.json b/extension.json
index 782ee88..cb5eff1 100644
--- a/extension.json
+++ b/extension.json
@@ -151,12 +151,6 @@
                        "localBasePath": "resources",
                        "remoteExtPath": "UniversalLanguageSelector/resources"
                },
-               "ext.uls.nojs": {
-                       "styles": "css/ext.uls.nojs.css",
-                       "position": "top",
-                       "localBasePath": "resources",
-                       "remoteExtPath": "UniversalLanguageSelector/resources"
-               },
                "ext.uls.init": {
                        "targets": [ "desktop" ],
                        "dependencies": [ "ext.uls.common" ]
diff --git a/resources/css/ext.uls.nojs.css b/resources/css/ext.uls.nojs.css
deleted file mode 100644
index 10c965c..0000000
--- a/resources/css/ext.uls.nojs.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Don't show it to users who disabled JS */
-.client-nojs #pt-uls { /* stylelint-disable-line selector-no-id */
-       display: none;
-}
diff --git a/resources/css/ext.uls.pt.less b/resources/css/ext.uls.pt.less
index 821e31e..788266a 100644
--- a/resources/css/ext.uls.pt.less
+++ b/resources/css/ext.uls.pt.less
@@ -56,3 +56,8 @@
 #uls-settings-block div.input-settings-block:hover {
        color: #252525;
 }
+
+/* Don't show it to users who disabled JS */
+.client-nojs #pt-uls {
+       display: none;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/310855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e43e39d29c093a19f3e8355d657f162f9a62736
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Fomafix <foma...@googlemail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to