jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367635 )

Change subject: Also load CSS for Monaco when using the pollembed tag
......................................................................


Also load CSS for Monaco when using the pollembed tag

Change-Id: Iad3795268e231c0691d7d9a87575ab206e7306d5
---
M extension.json
M includes/PollNY.hooks.php
2 files changed, 3 insertions(+), 6 deletions(-)

Approvals:
  SamanthaNguyen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index d752a01..9d80880 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
        "name": "PollNY",
-       "version": "3.4.1",
+       "version": "3.4.2",
        "author": [
                "Aaron Wright",
                "David Pean",
diff --git a/includes/PollNY.hooks.php b/includes/PollNY.hooks.php
index 8430aa1..d7d0c59 100644
--- a/includes/PollNY.hooks.php
+++ b/includes/PollNY.hooks.php
@@ -182,11 +182,8 @@
                if( $poll_name ) {
                        global $wgOut, $wgUser, $wgExtensionAssetsPath, 
$wgPollDisplay;
 
-                       // Load CSS for non-Monaco skins - Monaco's ny.css 
already contains
-                       // PollNY's styles (and more)
-                       if ( get_class( $wgOut->getSkin() ) !== 'SkinMonaco' ) {
-                               $wgOut->addModuleStyles( 'ext.pollNY.css' );
-                       }
+                       // Load CSS
+                       $wgOut->addModuleStyles( 'ext.pollNY.css' );
 
                        // Disable caching; this is important so that we don't 
cause subtle
                        // bugs that are a bitch to fix.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad3795268e231c0691d7d9a87575ab206e7306d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <[email protected]>
Gerrit-Reviewer: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to